From 39747cb6e348cf4368deace3029c65c8d9105a4a Mon Sep 17 00:00:00 2001 From: sveckarel Date: Fri, 25 Oct 2019 00:47:49 +0200 Subject: [PATCH] Correction of Czech tranlations, adding missing keys --- .../assets/jsons/Translations/Buildings.json | 12 +-- .../Translations/Diplomacy,Trade,Nations.json | 2 +- .../jsons/Translations/Notifications.json | 2 +- android/assets/jsons/Translations/Other.json | 91 +++++++++++-------- android/assets/jsons/Translations/Techs.json | 2 +- .../jsons/Translations/Units,Promotions.json | 4 +- .../jsons/Tutorials/Tutorials_Czech.json | 2 +- .../jsons/Tutorials/Tutorials_English.json | 82 ++++++++--------- core/src/com/unciv/ui/utils/Fonts.kt | 2 +- .../unciv/ui/worldscreen/WorldScreenTopBar.kt | 4 +- 10 files changed, 110 insertions(+), 93 deletions(-) diff --git a/android/assets/jsons/Translations/Buildings.json b/android/assets/jsons/Translations/Buildings.json index 70837a8449..572a5cde70 100644 --- a/android/assets/jsons/Translations/Buildings.json +++ b/android/assets/jsons/Translations/Buildings.json @@ -91,7 +91,7 @@ Simplified_Chinese:"“时间能粉碎一切；所有事物终将在时流中衰老并被遗忘。”——亚里士多德", Czech:"'Čas věci rozdírá. Vše stárne pod mocí Času a je zapomenuto, jak Čas mine.' - Aristoteles" Polish:"'Czas kruszy wszystko; wszystko się starzeje i zostaje zapomniane w obliczu potęgi czasu.' - Arystoteles" -} +} /* @@ -532,7 +532,7 @@ Simplified_Chinese:"只能建造在被占领城市" Czech:"Lze vybudovat pouze v anektovaných městech" Polish:"Budowa możliwa tylko w okupowanych miastach" - + } "Stable":{ @@ -587,7 +587,7 @@ "'I think that if ever a mortal heard the word of God it would be in a garden at the cool of the day.' - F. Frankfort Moore":{ Italian:"'Penso che se mai un mortale ha sentito la voce di Dio, sarà stato in un giardino sul far della sera.' - F. Frankfort Moore" Simplified_Chinese:"“我相信如果有凡人能听到神谕，那一定是在天气凉爽时的花园之中。”——弗兰克·法兰克福·摩尔（英国作家）" - Polish:"'Gdyby śmiertelnik usłyszał głos Pana Boga, znalazłby w sadzie wraz z wiatren dniowym.' - F. Frankfort Moore" //hard to translate + Polish:"'Gdyby śmiertelnik usłyszał głos Pana Boga, znalazłby w sadzie wraz z wiatren dniowym.' - F. Frankfort Moore" //hard to translate } /* @@ -633,7 +633,7 @@ "Gain 100 Gold when you use a Great Person.":{ Italian:"Guadagni 100 Oro ogni volta che consumi un Grande Personaggio" Czech:"Získáme 100 Zlata za každé použití Velké Osobnosti" - Polish:"Otrzymasz 100 sztuk zlota gdy użyjesz Wielkiego Człowieka" + Polish:"Otrzymasz 100 sztuk zlota gdy użyjesz Wielkiego Człowieka" } "'The whole earth is the tomb of heroic men and their story is not given only on stone over their clay but abides everywhere without visible symbol woven into the stuff of other men's lives.' - Pericles":{ @@ -771,7 +771,7 @@ "'Architecture has recorded the great ideas of the human race. Not only every religious symbol, but every human thought has its page in that vast book.' - Victor Hugo":{ Italian:"'L'architettura ha registrato le più grandi idee della razza umana. Non solo ogni simbolo religioso, ma ogni pensiero umano ha la sua pagina in quel vasto libro.' - Victor Hugo" Simplified_Chinese:"“建筑记录了人类所有的伟大理念：不仅包括每一种宗教符号，还包括人类思想史的每一页。”——维克多·雨果" - Polish:"'Architektura to zapis wspaniałych idei ludzkości. W tej obszernej księdze swe miejsce ma nie tylko każdy symbol religijny, ale także każda myśl człowiecza.' - Victor Hugo" + Polish:"'Architektura to zapis wspaniałych idei ludzkości. W tej obszernej księdze swe miejsce ma nie tylko każdy symbol religijny, ale także każda myśl człowiecza.' - Victor Hugo" } "Hagia Sophia":{ @@ -982,7 +982,7 @@ German:"Verbindet Handelsrouten über Wasser" Polish:"Tworzy wodne szlaki handlowe" Russian:"Создаёт водные торговые пути" - Czech:"Propojí obchodní cesty přes moře a oceány" + Czech:"Propojí obchodní cesty přes vodu (oceán)" } "University":{ diff --git a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json index 3be4f8a400..583c35ada8 100644 --- a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json +++ b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json @@ -1427,7 +1427,7 @@ Italian:"Le unità possono imbarcarsi e attraversare gli oceani fin da subito, e ricevono +1 Visione quando imbarcate, e +10% Forza entro 2 caselle con un Moai." Portuguese:"Pode embarcar e mover unidades sobre oceanos imediatamente. +1 visão quando embarcado" French:"Peut embarquer et bouger sur les océans dès le début. +1 Vision lorsque embarqué." - Czech:"Může se okamžitě přesunovat mezi pevninou a mořem. +1 při nalodění. +10% bonus k bojové síle, pokud je v okolí 2 polí Moai." + Czech:"Může se okamžitě přesunovat mezi pevninou a oceánem. +1 při nalodění. +10% bonus k bojové síle, pokud je v okolí 2 polí Moai." Simplified_Chinese:"单位初始就拥有船运能力，可进入海滨和海洋地块，单位处于船运状态时+1视野。摩艾石像群周围2格内单位+10%战斗力" } diff --git a/android/assets/jsons/Translations/Notifications.json b/android/assets/jsons/Translations/Notifications.json index e3b31770ce..59fd006e20 100644 --- a/android/assets/jsons/Translations/Notifications.json +++ b/android/assets/jsons/Translations/Notifications.json @@ -163,7 +163,7 @@ Simplified_Chinese:"开始建造/组建：[construction]" Portuguese:"Os trabalhos começaram no(a) [construction]" Japanese:"[construction]の作業が開始されました", - Czech:"Začali jsme stavět stavbu [construction]" + Czech:"Začali jsme stavět stavbu/jednotku [construction]" } "[cityName] cannot continue work on [construction]":{ diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index f0dd24c8f8..b7988857d5 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -115,7 +115,7 @@ Portuguese:"Próxima unidade" French:"Unité suivante" Russian:"Следующий юнит" - Czech:"Další jednotky" + Czech:"Další jednotka" } "Pick a policy":{ @@ -465,7 +465,7 @@ Romanian:"Dezactivați această unitate pentru aurul [goldAmount]?" Dutch:"Deze eenheid ontbinden voor [goldAmount] goud?" Russian:"Распустить юнит за [goldAmount] золота?", - Czech:"Propustit tuto jednotku za [goldAmount] zlata?" + Czech:"Propustit tuto jednotku - dostaneme [goldAmount] zlata?" } "Create [improvement]":{ // for great units, fishing boats, etc. @@ -481,7 +481,7 @@ French:"Commencer un Age d'Or" Simplified_Chinese:"开启黄金时代" Russian:"Начать золотой век" - Czech:"Začít Zlatý věk" + Czech:"Zahájit Zlatý věk" } "Yes":{ @@ -619,6 +619,13 @@ Czech:"ZLATÝ VĚK" } + " BC":{ // Before Christus + Czech:" př. n. l." + }, + + " AC":{ // Anno Domini + Czech:" n. l." + }, /////// Menu table @@ -755,7 +762,7 @@ Simplified_Chinese:"摧毁城市" Portuguese:"Saquear cidade" Japanese:"ラゼ市" - Czech:"Vyhladit město" + Czech:"Srovnat město se zemí" } "Stop razing city":{ @@ -848,14 +855,16 @@ French:"Choisir une amélioration" Portuguese:"Escolha uma melhoria" Russian:"Выбрать улучшение" - Czech:"Zvolte vylepšení" + Czech:"Vyberte vylepšení" } "Provides [resource]":{ - } - + Czech:"Poskytuje [resource]" + }, + "Replaces [improvement]":{ - } + Czech:"Nahrazuje [improvement]" + }, "Pick now!": { //sample needed Italian: "Scegli ora!" @@ -1133,7 +1142,7 @@ French:"Points actuelles" Portuguese:"Pontos atuais" Russian:"Очков сейчас" - Czech:"Aktuální body" + Czech:"Získané body" } "Points per turn":{ @@ -1446,7 +1455,7 @@ German:"[percentage] erhöhte Verteidigungsstärke" French:"[percentage] de défense" Russian:"[percentage] к защите юнита", - Czech:"percentage] k obraně jednotky" + Czech:"[percentage] k obraně jednotky" } @@ -1606,7 +1615,11 @@ Portuguese:"Felicidade base" German:"Grundzufriedenheit" Czech:"Základní spokojenost" -} +}, + + "Occupied City": { + "Czech":"Obsazená města" + }, "Buildings":{ Italian:"Edifici" @@ -1730,7 +1743,7 @@ Simplified_Chinese:"建筑维护费" Portuguese:"Manutenção" German:"Wartung" - Czech:"Údržba (žold)" + Czech:"Údržba budov" } "Transportation upkeep":{ @@ -1742,7 +1755,7 @@ Simplified_Chinese:"道(铁)路维护费" Portuguese:"Manutenção de transporte" German:"Unterhalt für Transport" - Czech:"Údržba dopravy" + Czech:"Údržba cest" } "Unit upkeep":{ @@ -1803,7 +1816,11 @@ Portuguese:"Cidade mais próxima" German:"Nächstgelegene Stadt" Czech:"Nejbližší město" -} +}, + "Action":{ // Overview -> Units - Action (Header) + Czech:"Činnost" + }, + "Defeated":{ Italian:"Sconfitto" @@ -1846,7 +1863,7 @@ Simplified_Chinese:"征服胜利" Portuguese:"Vitória por conquista" Russian:"Завоевание" - Czech:"Vítězství bojem" + Czech:"Vítězství v boji" } "Complete all the spaceship parts\n to win!":{ @@ -1855,8 +1872,8 @@ French:"Construisez toutes les parties du \n vaisseau spatial pour gagner!" Russian:"Постройте все части космического корабля\n чтобы победить!" Simplified_Chinese:"完成建造太空飞船\n胜利！" - Portuguese:"Complete todas as partes da nave para ganhar" - Czech:"Postavte všechny části vesmírné lodi\n k vítězství!" + Portuguese:"Complete todas as partes da nave para ganhar", + Czech:"Vybudováním všech šesti části vesmírné lodi\n dosáhneme vítězství!" } "Complete 4 policy branches\n to win!":{ @@ -1865,8 +1882,8 @@ French:"Completer 4 Doctrines pour gagner!" Russian:"Завершите 4 ветви общественных институтов\n чтобы победить!" Simplified_Chinese:"完成4个社会政策分支\n胜利！" - Portuguese:"Complete 4 árvores de politicas para ganhar" - Czech:"Zkompletujte 4 větve sociální politiky\n k vítězství!" + Portuguese:"Complete 4 árvores de politicas para ganhar", + Czech:"Zkompletováním 4 větví Sociální politiky\n dosáhneme vítězství!" } "Destroy all enemies\n to win!":{ @@ -1875,8 +1892,8 @@ French:"Eliminer tous vos adversaires pour gagner!" Russian:"Уничтожьте всех врагов\n чтобы победить!" Simplified_Chinese:"消灭所有敌人\n胜利!" - Portuguese:"Destrua todos os inimigos para ganhar" - Czech:"Zničte všechny nepřátele\n k vítězství!" + Portuguese:"Destrua todos os inimigos para ganhar", + Czech:"Zničením všech ostatních civilizací\n dosáhneme vítězství!" } "You have won a scientific victory!":{ @@ -1886,7 +1903,7 @@ Russian:"Вы одержали научную победу!" Simplified_Chinese:"恭喜！你赢得了科技胜利!" Portuguese:"Você ganhou uma vitória ciêntifica!" - Czech:"Dosáhli jste výzkumného vítězství!" + Czech:"Dosáhli jste vítězství ve hře díky Výzkumu!" } "You have won a cultural victory!":{ @@ -1896,7 +1913,7 @@ Russian:"Вы одержали культурную победу!" Simplified_Chinese:"恭喜！你赢得了文化胜利！" Portuguese:"Você ganhou uma vitória cultural!", - Czech:"Dosáhli jste kulturního vítězství!" + Czech:"Dosáhli jste vítězství ve hře díky Kulturní vyspělosti!" } "You have won a domination victory!":{ @@ -1906,31 +1923,31 @@ Russian:"Вы победили, завоевав всех!" Simplified_Chinese:"恭喜！你赢得了征服胜利！" Portuguese:"Você ganhou uma vitória de dominação!", - Czech:"Dosáhli jste vítězství díky dominanci!" + Czech:"Dosáhli jsme vítězství ve hře zničením všech ostatních civilizací!" } // TODO (4) "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:"你们依靠文化的强大力量取得了胜利。你们文明的伟大创作——富丽堂皇的建筑和鬼斧神工的艺术品震惊了世界！这些沁入心扉的美丽给疲乏的心带来温暖，给悲伤的人送去欢乐，诗人为你赞叹，乐者为你歌唱！" - Czech:"" + Czech:"Dosáhli jsme vítězství díky úžasné dokonalé kulturnosti. Velikost naší říše - velkolepost vybudovaných památek a preciznost našich umělců ohromila svět! Básníci nás budou velebit, dokud vše krásné bude přinášet potěšení unavenému srdci." } "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:"世界因战争而动荡不安。许多伟大而且强势的文明衰落了，但你们幸存了下来——并且取得了胜利！世界将永远记住你的光辉与荣耀！" - Czech:"" + Simplified_Chinese:"世界因战争而动荡不安。许多伟大而且强势的文明衰落了，但你们幸存了下来——并且取得了胜利！世界将永远记住你的光辉与荣耀！", + Czech:"Celý svět byl zachvácen válkou. Velké a slavné civilizace byly zničeny, ale naše říše dokázala jako jediná přežít a zvítězit. Svět nikdy nezapomene na tento fenomenální triumf!" } "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:"你们通过掌握先进的科技取得了胜利!你们已经征服了大自然的神秘，带领人民踏上了通往美丽新世界的航程！只要星星在夜空中燃烧，你的胜利就会被永远铭记！" - Czech:"" + Czech:"Zvítězili jsme ve hře díky enormnímu úsilý a mistrovství našich vědců. Poodhalili jste tajemství přírody a dovedli naše obyvatele na cestu poznání k novým světům. Na tento úspěch se bude vzpomínat dokud budou svítit hvězdy na nebi!" } "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:"你被打败了。虽然你们的文明曾经被许多敌人所征服，但是你的人民永不放弃，因为他们知道总有一天你会回来的！那时，你的文明将会成为天空中最耀眼的恒星！" - Czech:"" + Czech:"Byli jsme poraženi. Naše civilizace byla převálcována schopnostmi nepřátel. Naši lidé ovšem nezoufají, protože ví, že jednou se jejich vůdce vrátí. A dovede je k vytouženému vítězství!" } "One more turn...!":{ @@ -1943,17 +1960,17 @@ Czech:"Ještě jedno kolo..." } - "Built Apollo Program":{ + "Built Apollo Program":{ // Menu -> Victory status -> Science victory -> Built Apollo Program (header) Italian:"Programma Apollo costruito" German:"Vollendete das Apollo-Programm" //not sure about the context here French:"Construiser le programme Apollo" //same, it could be "construire" Simplified_Chinese:"开启阿波罗计划" Portuguese:"Completou o programa Apollo" //wound't make sense to say built as the program wasan't 'built' per se, it was the sequence of spaceship launches, america dind't launch the program itself into space... Russian:"Построена Программа Аполлон" - Czech:"Zkompletovaný Apollo Program" + Czech:"Hotový Apollo Program" } - "Destroy [civName]":{ + "Destroy [civName]":{ // Menu -> Victory status -> Conquest victory -> Destroy [civName] (column) Italian:"Distruggi [civName]" German:"Zerstöre [civName]" French:"Détruiser [civName]" @@ -1968,7 +1985,7 @@ French:"Notre situation" Simplified_Chinese:"我们文明的胜利进度" Russian:"Наш статус" - Czech:"Náš status" + Czech:"Naše vyhlídky" } "Global status":{ @@ -1976,7 +1993,7 @@ French:"Situation globale" Simplified_Chinese:"所有文明的胜利进度" Russian:"Глобальный статус" - Czech:"Globální status" + Czech:"Globální situace" } "Spaceship parts remaining":{ @@ -1984,7 +2001,7 @@ French:"Parties de Vaisseau spatial manquantes" Simplified_Chinese:"未完成建造的飞船组件" Russian:"Осталось частей КК" - Czech:"Zbývající části Vesmírné lodi" + Czech:"Chybějící části Vesmírné lodi" } "Branches completed":{ @@ -2000,7 +2017,7 @@ French:"Civilization invaincues" Simplified_Chinese:"未被征服的文明" Russian:"Непобеждённые цивилизации" - Czech:"Přeživší civilizace" + Czech:"Neporažené civilizace" } @@ -2081,7 +2098,7 @@ French:"Razer" Simplified_Chinese:"摧毁" Russian:"Разорить" - Czech:"Vyhladit" + Czech:"Srovnat se zemí" } "Razing the city annexes it, and starts razing the city to the ground.":{ diff --git a/android/assets/jsons/Translations/Techs.json b/android/assets/jsons/Translations/Techs.json index 22715377b4..77f71160ae 100644 --- a/android/assets/jsons/Translations/Techs.json +++ b/android/assets/jsons/Translations/Techs.json @@ -1427,7 +1427,7 @@ Russian:"Позволяет наземным единицам выходить в океан" Simplified_Chinese:"拥有船运能力的单位能够进入海洋" Portuguese:"Permite que unidades embarcadas entrem em telhas oceânicas" - Czech:"Odemyká naloděným jednotkám možnost vyplout na moře a oceán" + Czech:"Umožňuje naloděným jednotkám vyplout na oceán" } "Increases embarked movement +1":{ diff --git a/android/assets/jsons/Translations/Units,Promotions.json b/android/assets/jsons/Translations/Units,Promotions.json index cea3f4db0a..72b30db436 100644 --- a/android/assets/jsons/Translations/Units,Promotions.json +++ b/android/assets/jsons/Translations/Units,Promotions.json @@ -306,7 +306,7 @@ Portuguese:"Não pode entrar o terreno 'oceano' até a pesquisa Astronomia" // if you want you can take away the 'a pesquisa' German:"Ozeanfelder können nicht befahren werden bis Astronomie erforscht ist" Russian:"Для выхода в океан нужно открыть Астрономию" - Czech:"Nelze vplout na volné moře před objevem Astronomie" + Czech:"Nelze vplout na oceán před objevem Astronomie" } "May create improvements on water resources":{ @@ -349,7 +349,7 @@ Portuguese:"Não pode entrar o terreno 'oceano' " German:"Ozeanfelder können nicht befahren werden" Russian:"Не может выйти в океан" - Czech:"Nelze vplout na otevřené moře" + Czech:"Nelze vyplout na oceán" } "Chariot Archer":{ diff --git a/android/assets/jsons/Tutorials/Tutorials_Czech.json b/android/assets/jsons/Tutorials/Tutorials_Czech.json index f1c5157088..b9eac33032 100644 --- a/android/assets/jsons/Tutorials/Tutorials_Czech.json +++ b/android/assets/jsons/Tutorials/Tutorials_Czech.json @@ -215,7 +215,7 @@ [ "Ve hře UnCiv existují celkem tři způsoby jak zvítězit. Tady jsou:", " - Kulturní vítězství: Zkompletovat 4 větve Sociální politiky", - " - Vítězství v boji: Buďte poslední civilizací, která přežije (zničte všechny ostatní)", + " - Vítězství v boji: Buďme poslední civilizací, která přežije (zničme všechny ostatní)", " - Vědecké vítězství: Získá ho ten, kdo první zkoustruuje vesmírnou loď pro cestu na Alfa Centauri" ], [ diff --git a/android/assets/jsons/Tutorials/Tutorials_English.json b/android/assets/jsons/Tutorials/Tutorials_English.json index 091d4d7427..98b125e487 100644 --- a/android/assets/jsons/Tutorials/Tutorials_English.json +++ b/android/assets/jsons/Tutorials/Tutorials_English.json @@ -1,8 +1,8 @@ -{ +{ // Each entry s a tutorial, but the tutorial may be spread over separate paragraphs. // Entries starting with a _ will NOT be shown in Civilopedia. - - + + New_Game: [ [ "Hello, and welcome to Unciv!", @@ -26,10 +26,10 @@ "You only need to settle right next to resources if you need them immediately – ", " which might be the case now and then, but you’ll usually have the luxury of time." ], - + ], - - + + _City_Founded : [ [ "You have founded a city!", @@ -39,7 +39,7 @@ " choose production, and see information on the city" ], ] - + First_Steps : [ [ "Once you have your first city up and running you’ll be able to start production of a new unit", @@ -57,8 +57,8 @@ "Fast expanding is absolutely critical in most games of this type.", ], ], - - + + Next_Turn : [ [ "Once you've done everything you can in this turn, ", @@ -79,7 +79,7 @@ " number of things requiring your attention" ] ], - + Culture_and_Policies: [ // Activated when entering policy picker screen [ "Each turn, the culture you gain from all your ", @@ -97,7 +97,7 @@ " the cost of adopting another policy rises - so choose wisely!" ] ], - + Cities: [ [ "Each population in your city can work a single tile, providing the city with that tile's yields.", @@ -116,7 +116,7 @@ " which is not generated by tiles but rather by buildings." ], ], - + Technology: [ [ "Technology is central to your civilization,", @@ -129,10 +129,10 @@ " and your civilization will research the necessary technologies to get there" ] ], - - - - + + + + Happiness:[ [ "As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.", @@ -151,7 +151,7 @@ "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." ], - + ] @@ -181,7 +181,7 @@ ] ], - + Unhappiness: [ [ "It seems that your citizens are unhappy!", @@ -198,7 +198,7 @@ " or by having improved luxury resources within your borders" ] ], - + Golden_Age: [ [ "You have entered a golden age!", @@ -208,7 +208,7 @@ " and every tile already providing at least one gold will provide an extra gold." ] ], - + Roads_and_Railroads: [ [ "Connecting your cities to the capital by roads", @@ -216,9 +216,9 @@ "Note that each road costs 1 gold Maintenance per turn, and each Railroad costs 2 gold," " so it may be more economical to wait until the cities grow!" ] - + ] - + Victory_Types:[ [ "Once you’ve settled your first two or three cities you’re probably 100 to 150 turns into the game.", @@ -236,7 +236,7 @@ "Obviously, there is much more to it than that, but it is important not to jump into the deep end before you know how to swim.", ] ] - + Enemy_City: [ [ "Cities can be conquered by reducing their health to 1,", @@ -245,7 +245,7 @@ " and use your melee units to defend them until the city has been defeated!" ] ] - + Luxury_Resource: [ [ "Luxury resources within your domain and with their specific improvement are connected to your trade network.", @@ -254,7 +254,7 @@ " so use them for trading with other civilizations!" ] ] - + Strategic_Resource: [ [ "Strategic resources within your domain and with their specific improvement are connected to your trade network.", @@ -265,7 +265,7 @@ "The top bar keeps count of how many unused strategic resources you own." ] ] - + _EnemyCityNeedsConqueringWithMeleeUnit: [ [ "The city can no longer put up any resistance!", @@ -283,10 +283,10 @@ "The city will not increase your tech or policy cost, but its citizens will generate 1.5x the regular unhappiness.", "Annexing the city will give you control over the production, but will increase the citizen's unhappiness to 2x!", "This can be mitigated by building a courthouse in the city, returning the citizen's unhappiness to normal.", - "A puppeted city can be annexed at any time, but annexed vities cannot be returned to a puppeted state!" + "A puppeted city can be annexed at any time, but annexed cities cannot be returned to a puppeted state!" ] ], - + _BarbarianEncountered: [ [ "You have encountered a barbarian unit!", @@ -294,7 +294,7 @@ " civilian units go near them, and be careful of your scout!" ] ] - + _OtherCivEncountered: [ [ "You have encountered another civilization!", @@ -302,7 +302,7 @@ " but they may choose to declare war on you later on" ] ] - + _GameCrashed: [ [ "Oh no! It looks like something went DISASTROUSLY wrong!", @@ -312,14 +312,14 @@ " and I'll try to fix it as fast as I can!" ] ] - + Apollo_Program: [ [ "Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities", " (with the relevant technologies) to win a scientific victory!" ] ] - + Injured_Units:[ [ "Injured units deal less damage, but recover after turns that they have been inactive", @@ -327,7 +327,7 @@ " 15 inside your territory and 20 in your cities" ] ] - + Workers:[ [ "Workers are vital to your cities' growth, since only they can onstruct improvements on tiles", @@ -335,7 +335,7 @@ " while working the same amount of tiles!" ] ] - + Siege_Units:[ [ "Siege units are extremely powerful against cities, but need to be Set Up before they can attack.", @@ -343,7 +343,7 @@ " but once moved to another tile, it will need to be set up again." ] ] - + Embarking:[ [ "Once a certain tech is researched, your land units can embark, allowing them to traverse water tiles.", @@ -359,8 +359,8 @@ " but citizens cannot be assigned to faraway tiles." ] ] - - + + Idle_Units:[ [ "If you don't want to move a unit this turn, you can skip it by clicking 'Next unit' again.", @@ -369,7 +369,7 @@ "If you want to disable the 'Next unit' feature entirely, you can toggle it in Menu -> Check for idle units", ] ] - + Contact_Me: [ [ @@ -388,10 +388,10 @@ " So contact me! Send me an email, review, Github issue" " or mail pigeon, and let's figure out how to make the game ", " even more awesome!" - "(Contact info is in the Play Store)" + "(Contact info is in the Play Store)" ] ], - + _Pillaging:[ [ "Military units can pillage improvements, which heals them 25 health and ruins the improvement.", @@ -399,5 +399,5 @@ "Workers can repair these improvements, which takes less time than building the improvement from scratch.", ] ] - + } diff --git a/core/src/com/unciv/ui/utils/Fonts.kt b/core/src/com/unciv/ui/utils/Fonts.kt index 82935728e5..848b7365ab 100644 --- a/core/src/com/unciv/ui/utils/Fonts.kt +++ b/core/src/com/unciv/ui/utils/Fonts.kt @@ -60,7 +60,7 @@ class Fonts { val defaultText = "AÀÁBCČĆDĐEÈÉFGHIÌÍÏJKLMNOÒÓÖPQRSŠTUÙÚÜVWXYZŽaäàâăbcčćçdđeéèfghiìîjklmnoòöpqrsșštțuùüvwxyzž" + "АБВГҐДЂЕЁЄЖЗЅИІЇЙЈКЛЉМНЊОПРСТЋУЎФХЦЧЏШЩЪЫЬЭЮЯабвгґдђеёєжзѕиіїйјклљмнњопрстћуўфхцчџшщъыьэюя" + // Russian "ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρστυφχψωάßΆέΈέΉίϊΐΊόΌύΰϋΎΫΏ" + // Greek - "ÀÄĂÂĎÊĚÉÈÍÎŁĹĽÔÓÖƠŘŔŚŤƯŮÚÜŻŹäâąďêęěłĺľńňôöơřŕśťưůýżźáèìíóú" + + "ÀÄĂÂĎÊĚÉÈÍÎŁĹĽÔÓÖƠŘŔŚŤƯŮÚÜÝŻŹäâąďêęěłĺľńňôöơřŕśťưůýżźáèìíóú" + "กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛" + // Thai "1234567890" + "‘?’'“!”(%)[#]{@}/&\\<-+÷×=>®©\$€£¥¢:;,.¡*|" diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt b/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt index 4a4e92b91f..debe032259 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt @@ -128,7 +128,7 @@ class WorldScreenTopBar(val screen: WorldScreen) : Table() { else -> 2020+(turns-440)/2 } - turnsLabel.setText("Turn".tr()+" " + civInfo.gameInfo.turns + " | "+ abs(year)+(if (year<0) " BC" else " AD")) + turnsLabel.setText("Turn".tr()+" " + civInfo.gameInfo.turns + " | "+ abs(year)+(if (year<0) " BC.tr()" else " AD.tr()")) val nextTurnStats = civInfo.statsForNextTurn val goldPerTurn = "(" + (if (nextTurnStats.gold > 0) "+" else "") + Math.round(nextTurnStats.gold) + ")" @@ -171,4 +171,4 @@ class WorldScreenTopBar(val screen: WorldScreen) : Table() { return happinessText } -} \ No newline at end of file +}