diff --git a/android/assets/jsons/Nations_Italian.json b/android/assets/jsons/Nations_Italian.json index 5702a36a..d2fa944e 100644 --- a/android/assets/jsons/Nations_Italian.json +++ b/android/assets/jsons/Nations_Italian.json @@ -504,6 +504,40 @@ "Bodrum","Eregli","Silifke","Sivas","Amasya","Marmaris","Trabzon","Erzurum","Urfa","Izmit","Afyonkarhisar", "Bitlis","Yalova"] }, + { + name:"Korea", + translatedName:"Corea", + leaderName:"Sejong", + + startIntroPart1: "" + startIntroPart2: "" + + declaringWar:"Jip-hyun-jun (la Sala dei Giusti) non tollera più la tua insolenza. Libereremo i tuoi cittadini oppressi anche con la forza, e li illumineremo!" + attacked:"Sciocca progenie di una megera! Sarete distrutti dalla magnifica potenza scientifica del mio paese!" + defeated:"Ora resta da vedere chi proteggerà il mio popolo... Il buio è giunto." + introduction:"Benvenuto nel palazzo dei Choson, straniero. Io sono il re Sejong l'Istruito, sovrano di queste terre e di questo popolo." + + neutralHello:"Salve." + neutralLetsHearIt:["Sentiamo.","Vai avanti","Continue."] + neutralNo:["Non posso farlo.","Spiacente, ma non posso accettare."] + neutralYes:["Ciò sta bene.","Capisco...","Certamente!"] + + hateHello:"Oh, sei tu..." + hateLetsHearIt:["Cosa vorresti dire?","Dunque?","Parla pure."] + hateNo:["Il cielo me ne scampi.","Questa è follia!","Non posso far ciò."] + hateYes:["Hm... va bene, d'accordo.","Credo dovrei accettare...","Va bene..."] + + afterPeace:"Vedo che hai sviluppato delle strategie interessanti... Benissimo, credo dovremo finirla qui." + tradeRequest:"Abbiamo molte cose da discutere e tanto da guadagnare tra di noi." + + outerColor:[0,0,255], + innerColor:[255,0,0], + uniqueName:"Sapienti della Sala di Giada", + unique:"+2 Scienza per ogni specialista e ogni miglioramento da Gran Personaggio.", + cities:["Seoul","Busan","Jeonju","Daegu","Pyongyang","Kaesong","Suwon","Gwangju","Gangneung","Hamhung","Wonju","Ulsan", + "Changwon","Andong","Gongju","Haeju","Cheongju","Mokpo","Dongducheon","Geoje","Suncheon","Jinju","Sangju", + "Rason","Gyeongju","Chungju","Sacheon","Gimje","Anju"] + }, /* { name:"Mongolia", @@ -576,40 +610,6 @@ "Chondote","Canajoharie","Nedrow","Oneida Lake","Kanonwalohale","Green Bay","Southwold","Mohawk Valley","Schoharie", "Bay of Quinte","Kanawale","Kanatsiokareke","Tyendinaga","Hahta"] }, - { - name:"Korea", - translatedName:"Corea", - leaderName:"Sejong", - - startIntroPart1: "" - startIntroPart2: "" - - declaringWar:"Jip-hyun-jun (la Sala dei Giusti) non tollera più la tua insolenza. Libereremo i tuoi cittadini oppressi anche con la forza, e li illumineremo!" - attacked:"Sciocca progenie di una megera! Sarete distrutti dalla magnifica potenza scientifica del mio paese!" - defeated:"Ora resta da vedere chi proteggerà il mio popolo... Il buio è giunto." - introduction:"Benvenuto nel palazzo dei Choson, straniero. Io sono il re Sejong l'Istruito, sovrano di queste terre e di questo popolo." - - neutralHello:"Salve." - neutralLetsHearIt:["Sentiamo.","Vai avanti","Continue."] - neutralNo:["Non posso farlo.","Spiacente, ma non posso accettare."] - neutralYes:["Ciò sta bene.","Capisco...","Certamente!"] - - hateHello:"Oh, sei tu..." - hateLetsHearIt:["Cosa vorresti dire?","Dunque?","Parla pure."] - hateNo:["Il cielo me ne scampi.","Questa è follia!","Non posso far ciò."] - hateYes:["Hm... va bene, d'accordo.","Credo dovrei accettare...","Va bene..."] - - afterPeace:"Vedo che hai sviluppato delle strategie interessanti... Benissimo, credo dovremo finirla qui." - tradeRequest:"Abbiamo molte cose da discutere e tanto da guadagnare tra di noi." - - outerColor:[0,0,255], - innerColor:[255,0,0], - uniqueName:"Sapienti della Sala di Giada", - unique:"+2 Scienza per ogni miglioramento da Gran Personaggio.", - cities:["Seoul","Busan","Jeonju","Daegu","Pyongyang","Kaesong","Suwon","Gwangju","Gangneung","Hamhung","Wonju","Ulsan", - "Changwon","Andong","Gongju","Haeju","Cheongju","Mokpo","Dongducheon","Geoje","Suncheon","Jinju","Sangju", - "Rason","Gyeongju","Chungju","Sacheon","Gimje","Anju"] - }, { name:"Persian", translatedName:"Persia", diff --git a/android/assets/jsons/Translations/Buildings.json b/android/assets/jsons/Translations/Buildings.json index 8b48d718..c7daa7ff 100644 --- a/android/assets/jsons/Translations/Buildings.json +++ b/android/assets/jsons/Translations/Buildings.json @@ -228,6 +228,7 @@ German:"Kultur- und Goldkosten für den Erwerb neuer Felder in dieser Stadt sind um 25% reduziert" French:"Cout d'acquisition en or et en culture de nouvelle cases réduit de 25% dans cette ville" Polish:"Koszt uzyskania nowego pola (w kulturze lub złocie) zmniejszony o 25% w tym mieście" + Russian:"-25% к необходимому количеству Культура и Золото для получения клеток вокруг данного города" } "Colossus":{ @@ -235,7 +236,7 @@ Simplified_Chinese:"太阳神巨像" French:"Colosse" Polish:"Kolos rodyjski" - Russian:"Колосс" + Russian:"Колосс Родосский" } "+1 gold from worked water tiles in city":{ @@ -243,6 +244,7 @@ Simplified_Chinese:"所在城市每个水上地块+1金钱" French:"+1 or pour les cases maritimes exploitées par la ville" Polish:"+1 do złota z obsadzonych pól wodnych w tym mieście" + Russian:"+1 Золото от обрабатываемых водных клеток вокруг города" } "Temple":{ @@ -368,6 +370,7 @@ French:"+1 nourriture des cases océans et côtes" Simplified_Chinese:"每个海滨地块和海洋地块+1食物" Polish:"+1 do żywności z pól wybrzeża i oceanicznych" + Russian:"+1 Еда от клеток около берега и в океане" } "The Great Lighthouse":{ @@ -391,6 +394,7 @@ Portuguese:"Todas as unidades navais recebem +1 movimento e +1 em sua linha de visão" German:"Alle militärischen Marineeinheiten erhalten +1 Bewegung und +1 Sicht" Polish:"Każda jednostka marynarki otrzymuje +1 do ruchu i pola widzenia" + Russian:"Все военно-морские юниты получают +1 к движению и обзору" } /* @@ -425,6 +429,7 @@ French:"+15% Production lorsqu'une unité montée est produite dans cette ville" Simplified_Chinese:"组建骑乘单位时产能积累速率+15%" Polish:"+15% do produkcji jednostek kawalerii" + Russian:"+15% Производство при постройке конных юнитов в данном городе" } "Circus Maximus":{ @@ -534,6 +539,7 @@ German:"Gibt 1 extra Einheit jeder verbesserten Luxusresource in der Nähe dieser Stadt" French:"Produit un exemplaire supplémentaire de chaque ressources de luxe à côté de cette ville" Polish:"Każdy luksusowy surowiec w granicach miasta jest liczony podwójnie" + Russian:"Предоставляет копию каждого обрабатываемого редкого ресурса около данного города" } "+2 Gold for each source of Oil and oasis":{ @@ -544,6 +550,7 @@ German:"+2 Gold für jede Ölquelle oder Oase" French:"+2 or pour chaque ressources de pétrole et d'oasis" Polish:"+2 do złota z każdej oazy lub złoża ropy" + Russian:"+2 Золото от каждого источника Нефть и оазиса" } "Monastery":{ @@ -584,7 +591,7 @@ "+33% great person generation in all cities":{ Italian:"+33% di generazione di Grandi Personaggi in tutte le città" - Russian:"+ 33% к созданию великих людей во всех городах" + Russian:"+33% к созданию великих людей во всех городах" French:"+ 33% de génération de Personnages illustres dans toutes les villes" Romanian:"+33% generație de persoane mari în toate orașele" German:"+33% erhöhte Wahrscheinlichkeit für die Geburt Großer Persönlichkeiten" @@ -670,6 +677,7 @@ Simplified_Chinese:"境内敌方陆军单位在任何地块额外消耗1移动力" French:"Les unités terrestre ennemies doivent dépenser un point de déplacement supplémentaires quand elles sont dans votre territoire (rendus obsolète par la Dynamite)" Polish:"Każda lądowa jednostka wroga musi zużyć dodatkowy 1 punkt ruchu by wejść na twoje terytorium (przestarzały po odkryciu dynamitu)" + Russian:"Вражеские наземные юниты должны тратить дополнительное очко передвижения на вашей территории (устаревает при открытии Динамита)" } "Workshop":{ @@ -731,6 +739,7 @@ Portuguese:"1+ de produção de todos os recursos marítimos trabalhados pelo cidade" German:"+1 Produktion von allen Meer Ressourcen die von dieser Stadt bewirtschaftet werden" Polish:"+1 do produkcji za każdy wydobywany surowiec morski" + Russian:"+1 Производство от всех обрабатываемых городом морских клеток" } "Connects trade routes over water":{ @@ -742,6 +751,7 @@ Portuguese:"Conecta rotas comerciais pela água" German:"Verbindet Handelsrouten über Wasser" Polish:"Tworzy wodne szlaki handlowe" + Russian:"Создаёт водные торговые пути" } "University":{ @@ -806,6 +816,7 @@ French:"Fort Monghol" Polish:"Fort Mogołów" Simplified_Chinese:"莫卧儿城塞" + Russian:"Красный Форт" } "Alhambra":{ @@ -823,6 +834,7 @@ French:"Toutes les unités terrestres, montées, et renforcées produites dans cette ville recoivent la promotion Percé I" //not sure about the name of the promotion Simplified_Chinese:"所在城市新组建的近战、骑乘和装甲单位获得“操练I级”晋升" Polish:"Każdy nowo wyszkolona w tym mieście jednostka walcząca w zwarciu otrzymuje umiejętność Musztra I" + Russian:"Производимые в данном городе юниты конные, бронированные, а также ближнего боя получают повышение Муштра I" } "Angkor Wat":{ @@ -871,6 +883,7 @@ Portuguese:"Aparece um Grande Cientista grátis" German:"Ein kostenloser Großer Wissenschaftler erscheint" Polish:"Pojawia się darmowy Wielki Naukowiec" + Russian:"Появляется бесплатный Великий Учёный" } "Ironworks":{ @@ -971,6 +984,7 @@ French:"+5% de production pour chaque routes commerciales connectées à une Cité état" Polish:"+5% do produkcji za każdy szlak handlowy z państwem-miastem" Simplified_Chinese:"每条通往城邦的贸易路线+5%产能" + Russian:"+5% Производство за каждый торговый маршрут с городом-государством" } /* @@ -1065,6 +1079,7 @@ Simplified_Chinese:"单位在境内+15%战斗力" French:"+15% de force de combat pour les unités combattants sur un territoire allié" Polish:"+15% do siły ataku jednostek walczących na przyjaznym terytorium" + Russian:"+15% к силе атаки юнитов, сражающихся на дружественной территории" } "Taj Mahal":{ @@ -1151,7 +1166,7 @@ "Free Great Artist Appears":{ Italian:"Appare un Grande Artista gratuito" - Russian:"Появляется бесплатный великий художник" + Russian:"Появляется бесплатный Великий Художник" French:"Artiste illustre gratuit apparaît" Romanian:"un Artist Mare gratuit apare" Dutch:"Een gratis geweldige artiest verschijnt" @@ -1183,6 +1198,7 @@ Portuguese:"'+1 de produção e ouro de todos os recursos navais trabalhados pela cidade" German:"+1 Produktion und Gold von allen Meeresressourcen die von der Stadt bewirtschaftet werden" Polish:"+1 do produkcji i złota ze wszystkich surowców morskich wydobywanych w mieście" + Russian:"+1 Производство и Золото от всех обрабатываемых морских клеток вокруг города" } "+15% production of naval units":{ @@ -1194,6 +1210,7 @@ Portuguese:"15% na produção de unidades marítimas" German:"+15% Produktion für Marineeinheiten" Polish:"+15% do produkcji jednostek marynarki" + Russian:"+15% Производство при постройке кораблей" } "Public School":{ @@ -1270,6 +1287,7 @@ Simplified_Chinese:"所有城市购买建造项目所需的金钱花费-15%" French:"-15% d'or pour les achats dans les villes" Polish:"-15% ceny budynków i jednostek kupowanych w złocie" + Russian:"-15% к стоимости покупки в городах" } "Cristo Redentor":{ @@ -1312,6 +1330,7 @@ Simplified_Chinese:"所有城市防御建筑建造速度+25%" French:"Les batiments de défense sont 25% plus efficace dans toutes les villes" Polski:"+25% skuteczności budowli obronnych w miastach" + Russian:"Защитные сооружения во всех городах на 25% эффективнее" } "Neuschwanstein":{ @@ -1319,7 +1338,7 @@ Simplified_Chinese:"新天鹅堡" French:"Château de Neuschwanstein" Polish:"Neuschwanstein" - Russian:"Замок Нойшванштейн" + Russian:"Замок Нойшванштайн" } "+1 happiness, +2 culture and +3 gold from every Castle":{ @@ -1327,6 +1346,7 @@ Simplified_Chinese:"每一座城堡+3金钱、+2文化和+1快乐" French:"+1 bonheur, +2 culture et +3 or produits par tous les châteaux" Polish:"+1 do zadowolenia, +2 do kultury i +3 do złota z każdego zamku" + Russian:"+1 Счастье, +2 Культура и +3 Золото от каждого замка" } "Military Academy":{ @@ -1393,6 +1413,7 @@ French:"+1 Production par spécialiste" Simplified_Chinese:"每个专业人员+1产能" Polish:"+1 do produkcji ze specjalistów" + Russian:"+1 Производство от специалистов" } "Medical Lab":{ @@ -1457,7 +1478,7 @@ "Must be next to desert":{ Italian:"Deve rasentare Deserto" - Russian:"Должно быть рядом с пустыней" + Russian:"Должно быть построено рядом с пустыней" French:"Doit être à côté d'un désert" Romanian:"Trebuie să fie lângă deșert" German:"Muss an eine Wüste grenzen" @@ -1473,6 +1494,7 @@ Simplified_Chinese:"城市必须紧邻山脉" French:"Doit être à côté d'une montagne" Polish:"Musi być przy górze" + Russian:"Должно быть построено рядом с горой" } "Sydney Opera House":{ @@ -1504,6 +1526,7 @@ French:"+1 population dans chaque villes" Simplified_Chinese:"每座城市+1人口" Polish:"+1 do populacji w każdym mieście" + Russian:"+1 к населению в каждом городе" } "+1 happiness in each city":{ @@ -1512,6 +1535,7 @@ French:"+1 bonheur dans chaque villes" Simplified_Chinese:"每座城市+1快乐" Polish:"+1 do zadowolenia w każdym mieście" + Russian:"+1 Счастье в каждом городе" } "Pentagon":{ @@ -1529,7 +1553,7 @@ Romanian:"Costurile în aur pentru dezvoltarea unităților militare reduse cu 33%" Simplified_Chinese:"升级军事单位所需的金钱-33%" Portuguese:"-33% custo de ouro para unidades militares" - Russian:"стоимость улучшения юнита снижается на 33%" + Russian:"Стоимость улучшения юнита снижается на 33%" German:"Goldkosten für die Verbesserung von Militäreinheiten ist um 33% reduziert" French:"Le coût en or de l'amélioration des unités militaires est réduit de 33%" Polish:"Koszt ulepszenia jednostki bojowej zmniejszony o 33%" @@ -1624,6 +1648,7 @@ French:"2 scientifiques illustres apparaissent" Simplified_Chinese:"2个免费的大科学家出现" Polish:"Pojawiają się 2 darmowi Wielcy Naukowcy" + Russian:"Появляется 2 бесплатных Великих учёных" } "Increases production of spaceship parts by 25%":{ @@ -1632,6 +1657,7 @@ French:"Améliore la production de pièces de vaisseau spatial de 25%" Simplified_Chinese:"建造太空船部件时+25%产能" Polish:"Zwiększa produkcję części statku kosmicznego o 25%" + Russian:"+25% Производство при постройке частей космического корабля" } "SS Booster":{ //no translation that I know of @@ -1719,7 +1745,7 @@ Simplified_Chinese:"需要城市附近有已开发的资源：[resource]" Portuguese:"Requer [resource] trabalhado perto da cidade" Polish:"Wymaga w mieście surowca [resource]" - Russian:"Требует добычи [buildingName] в городе" + Russian:"Требует добычи [resource] в городе" } "Wonder is being built elsewhere":{ diff --git a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json index ba0288bb..ee6f7198 100644 --- a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json +++ b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json @@ -173,7 +173,7 @@ Simplified_Chinese:"我们的关系：" Portuguese:"Nossas relações" Polish:"Nasze relacje:" - Russian:"Наши отношения" + Russian:"Наши отношения: " } "We have encountered the City-State of [name]!":{ // e.g. the Cultured city state of Vienna @@ -875,6 +875,7 @@ } "Wu Zetian":{ + Italian:"Wu Zetian" //Same as in Italian Simplified_Chinese:"武则天" Russian:"У Цзэтянь" }, @@ -916,7 +917,7 @@ Spanish:"+ 20% de producción hacia la construcción de maravillas." Romanian:"+ 20% producție spre construcția de mirare" Portuguese:"+ 20% de produção para construção de maravilhas" - Russian:"+20% производства на строительство чудес" + Russian:"+20% Производство при строительстве чудес" Simplified_Chinese:"建造奇观时+20%产能积累速率" } @@ -1032,7 +1033,7 @@ German:"+25% Produktion für alle Gebäude die bereits in der Hauptstadt existieren" French:"+25% de production pour tous les batiments déjà construits dans la capitale" Portuguese:"+ 25% Produção para quaisquer edifícios que já existam na Capital" - Russian:"+ 25% к любым зданиям, которые уже существуют в столице" + Russian:"+25% Производство при постройке зданий, которые уже существуют в столице" Simplified_Chinese:"在其他城市建造首都已建有的建筑时+25%产能积累" } @@ -1194,15 +1195,19 @@ French:"Corée" Portuguese:"Coréia" Simplified_Chinese:"朝鲜" - Russian:"Корея" + Russian:"Корея" } "Sejong":{ + Italian:"Sejong" Simplified_Chinese:"李裪" + Russian:"Седжон" } "+2 Science for all specialists and Great Person tile improvements":{ + Italian:"+2 Scienza per ogni specialista e ogni miglioramento da Gran Personaggio." Simplified_Chinese:"所有专业人员和所有伟人设施+2科研" + Russian:"+2 Наука для всех специалистов и улучшений клеток Великими людьми." } /* diff --git a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json index 2f358c43..c42ea340 100644 --- a/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json +++ b/android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json @@ -307,37 +307,48 @@ "Multiplayer":{ Simplified_Chinese:"多人游戏" + Italian:"Multigiocatore" } "Could not download game!":{ + Italian:"Impossibile scaricare partita!" } "Could not upload game!":{ + Italian:"Impossibile caricare partita" } "Join Game":{ + Italian:"Unisciti" } "Invalid game ID!":{ + Italian:"ID Partita non corretto" } "Copy User Id":{ + Italian:"Copia ID Utente" } "Copy Game Id":{ + Italian:"Copia ID Partita" } /// tutorials for multiplayer "To create a multiplayer game, check the 'multiplayer' toggle in the New Game screen, and for each human player insert that player's user ID.":{ + Italian:"Per creare una partita multigiocatore, attiva la spunta su 'Multigiocatore' nella schermata Nuova Partita, e inserisci l'ID utente per del giocatore per ogni rispettivo giocatore umano" } "You can assign your own user ID there easily, and othr players can copy their user IDs here and send them to you for you to include them in the game.":{ + Italian:"Puoi assegnarvi facilmente il tuo ID Utente, e altri giocatori possono copiarvi il loro ID Utente e mandartelo per unirsi alla partita." } "Once you've created your game, enter this screen again to copy the Game ID and send it to the other players.":{ + Italian:"Una volta creata la tua partita, ritorna in questa schermata per copiare l'ID Partita e mandala ad altri giocatori." } "Players can enter you game by copying the game ID to the clipboard, and clicking on the Join Game button":{ + Italian:"I giocatori possono entrare nella tua partita copiando il codice ID sugli appunti e cliccando il tasto Unisciti." } @@ -467,18 +478,22 @@ ////////////// Load map "Load map":{ + Italian:"Carica mappa" Simplified_Chinese:"载入地图" } "Are you sure you want to delete this map?":{ Simplified_Chinese:"你真想删除这张地图吗？" + Italian:"Vuoi davvero cancellare questa mappa?" } "Upload":{ Simplified_Chinese:"上传" - } + Italian:"Carica" + } "Could not upload map!":{ + Italian:"Impossibile caricare mappa!" Simplified_Chinese:"无法上传地图！" } @@ -600,10 +615,12 @@ } "Auto-assign city production":{ + Italian:"Autoassegna produzione città" Simplified_Chinese:"自动分配城市产能" } "Fontset":{ + Italian:"Fontset" Simplified_Chinese:"字体设置" } diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index 9b1ab55a..62ac4b47 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -30,6 +30,10 @@ German:"Bitte warten..." Japanese:"ワーキング..." } + + "Waiting for other players...":{ // Displayed when next turn is being...turned + Italian:"In attesa degli altri giocatori..." + } "in":{ // As in "Opera House in 3 turns" Italian:"tra" @@ -1671,15 +1675,19 @@ } "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." } "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!" } "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!" } "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!" } "One more turn...!":{ diff --git a/android/assets/jsons/Translations/Policies.json b/android/assets/jsons/Translations/Policies.json index d95248df..77620867 100644 --- a/android/assets/jsons/Translations/Policies.json +++ b/android/assets/jsons/Translations/Policies.json @@ -658,6 +658,69 @@ French:"Réduit le cout en culture des futures doctrines de 10%" } + + +////// Patronage branch +/* + "Patronage":{ + Italian:"Mecenatismo" + } + + "Influence with City-States degrades 25% slower than normal.":{ + Italian:"L'Influenza con le Città-Stato cala il 25% più lentamente rispetto al normale." + } + + "Philantropy":{ //unlocked when adopting Patronage + Italian:"Filantropia" + } + + "Gifting Gold to a City-State generates 25% more Influence":{ + Italian:"Donare Oro a una Città-Stato genera il 25% di Influenza in più." + } + + "Aesthetics":{ //unlocked when adopting Patronage + Italian:"Estetica" + } + + "Resting point for Influence level with all City-States is increased by 20.":{ + Italian:"Il punto neutro di livello d'Influenza per tutte le Città-Stato è portato a +20." + } + + "Scholasticism":{ //Needs Philantropy + Italian:"Scolasticismo" + } + + "All Allied City-States provide a Science bonus equal to 25% of what they produce for themselves.":{ + Italian:"Le Città-Stato tue alleate ti donano un bonus scientifico del 25% rispetto a quello che producono da sole." + } + + "Cultural Diplomacy":{ //Needs Scholasticism + Italian:"Diplomazia culturale" + } + + "Happiness from gifted Luxuries increased by 50%.":{ + Italian:"+50% Felicità dalle Risorse di Lusso date dalle città che ti sono Amiche o Alleate." + } + + "Educated Elite":{ //Needs Scholasticism and Aesthetics + Italian:"Elite culturale" + } + + "Allied City-States will occasionally gift you Great People.":{ + Italian:"Le Città-Stato Alleate ti doneranno occasionalmente dei Grandi Personaggi." + } + + "Patronage Complete":{ + Italian:"Mecenatismo completo" + } + + "Influence with City-States degrades 25% slower than normal.":{ + Italian:"L'Influenza con le Città-Stato cala il 33% più lentamente rispetto al normale." + } + +*/ + + ////// Commerce branch "Commerce":{ diff --git a/android/assets/jsons/Translations/Terrains,Resources,Improvements.json b/android/assets/jsons/Translations/Terrains,Resources,Improvements.json index 91f9fb8c..b59153e7 100644 --- a/android/assets/jsons/Translations/Terrains,Resources,Improvements.json +++ b/android/assets/jsons/Translations/Terrains,Resources,Improvements.json @@ -848,7 +848,8 @@ } "Barbarian encampment":{ + Italian:"Accampamento barbaro" Simplified_Chinese:"蛮族营地" } -} \ No newline at end of file +} diff --git a/android/assets/jsons/Translations/Units,Promotions.json b/android/assets/jsons/Translations/Units,Promotions.json index a0281d63..d598a8a8 100644 --- a/android/assets/jsons/Translations/Units,Promotions.json +++ b/android/assets/jsons/Translations/Units,Promotions.json @@ -1164,7 +1164,8 @@ Russian:"Истребитель" } - "Zero":{ + "Zero":{//Japanese unique + Italian:"Zero" Simplified_Chinese:"零式战斗机" } @@ -1177,6 +1178,12 @@ German:"Angriffshelikopter" French:"Hélicoptère de combat" } + + /* + "Atomic Bomb":{ + Italian:"Bomba atomica" + } + */ ////// Information era - not even putting here, too far off @@ -1186,6 +1193,23 @@ French:"Robot Mortel Géant" //The most accurate should be "Robot géant de la mort" but it sound really ridiculous Simplified_Chinese:"末日机甲" } + + "Stealth Bomber":{ + Italian:"Bombardiere stealth" + } + + "Jet Fighter":{ + Italian:"Caccia Jet" + } + + "Guided Missile":{ + Italian:"Missile guidato" + } + + "Nuclear Missile":{ + Italian:"Missile nucleare" + } + */ ////// Great units @@ -1421,6 +1445,10 @@ French:"Unités en terrain ouvert" Russian:"юниты на открытой местности" } + + "units in rough terrain":{ + + } "Barrage I":{ Italian:"Fuoco di Fila I" diff --git a/core/src/com/unciv/logic/automation/ConstructionAutomation.kt b/core/src/com/unciv/logic/automation/ConstructionAutomation.kt index 782d12fe..d602770e 100644 --- a/core/src/com/unciv/logic/automation/ConstructionAutomation.kt +++ b/core/src/com/unciv/logic/automation/ConstructionAutomation.kt @@ -6,6 +6,7 @@ import com.unciv.UnCivGame import com.unciv.logic.city.CityConstructions import com.unciv.logic.city.SpecialConstruction import com.unciv.logic.civilization.CityAction +import com.unciv.logic.civilization.PlayerType import com.unciv.models.gamebasics.Building import com.unciv.models.gamebasics.VictoryType import com.unciv.models.stats.Stat @@ -44,7 +45,7 @@ class ConstructionAutomation(val cityConstructions: CityConstructions){ } fun chooseNextConstruction() { - if (!UnCivGame.Current.settings.autoAssignCityProduction) return + if (!UnCivGame.Current.settings.autoAssignCityProduction && civInfo.playerType== PlayerType.Human) return if (cityConstructions.getCurrentConstruction() !is SpecialConstruction) return // don't want to be stuck on these forever addFoodBuildingChoice() diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index 62d00815..0f9e4763 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -395,7 +395,12 @@ class CivilizationInfo { notifications.add(Notification(text, color, action)) } - fun addGreatPerson(greatPerson: String, city:CityInfo = cities.random()) { + fun addGreatPerson(greatPerson: String){ + if(cities.isEmpty()) return + addGreatPerson(greatPerson, cities.random()) + } + + fun addGreatPerson(greatPerson: String, city:CityInfo) { placeUnitNearTile(city.location, greatPerson) addNotification("A [$greatPerson] has been born!".tr(), city.location, Color.GOLD) } diff --git a/core/src/com/unciv/ui/VictoryScreen.kt b/core/src/com/unciv/ui/VictoryScreen.kt index ef58fc3b..34924454 100644 --- a/core/src/com/unciv/ui/VictoryScreen.kt +++ b/core/src/com/unciv/ui/VictoryScreen.kt @@ -118,7 +118,7 @@ class VictoryScreen : PickerScreen() { fun scienceVictoryColumn():Table{ val t = Table() t.defaults().pad(5f) - t.add(getMilestone("Built Apollo Program".tr(),playerCivInfo.containsBuildingUnique("Enables construction of Spaceship parts"))).row() + t.add(getMilestone("Built Apollo Program",playerCivInfo.containsBuildingUnique("Enables construction of Spaceship parts"))).row() val victoryManager= playerCivInfo.victoryManager @@ -147,13 +147,13 @@ class VictoryScreen : PickerScreen() { val civName = if (playerCivInfo.diplomacy.containsKey(civ.civName)) civ.civName else "???" - table.add(getMilestone("Destroy [$civName]".tr(), civ.isDefeated())).row() + table.add(getMilestone("Destroy [$civName]", civ.isDefeated())).row() } return table } fun getMilestone(text:String, achieved:Boolean): TextButton { - val textButton = TextButton(text,skin) + val textButton = TextButton(text.tr(),skin) if(achieved) textButton.color = Color.GREEN else textButton.color = Color.GRAY return textButton diff --git a/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt index 57a119a5..1c9727f7 100644 --- a/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt @@ -80,6 +80,7 @@ class PolicyPickerScreen(val worldScreen: WorldScreen) : PickerScreen() { private fun pickPolicy(policy: Policy) { if (!worldScreen.isPlayersTurn + || viewingCiv.isDefeated() || viewingCiv.policies.isAdopted(policy.name) || policy.name.endsWith("Complete") || !viewingCiv.policies.isAdoptable(policy) diff --git a/core/src/com/unciv/ui/saves/LoadMapScreen.kt b/core/src/com/unciv/ui/saves/LoadMapScreen.kt index 43cc48c7..fac21405 100644 --- a/core/src/com/unciv/ui/saves/LoadMapScreen.kt +++ b/core/src/com/unciv/ui/saves/LoadMapScreen.kt @@ -11,9 +11,7 @@ import com.unciv.logic.map.TileMap import com.unciv.models.gamebasics.tr import com.unciv.ui.mapeditor.MapEditorScreen import com.unciv.ui.pickerscreens.PickerScreen -import com.unciv.ui.utils.disable -import com.unciv.ui.utils.enable -import com.unciv.ui.utils.onClick +import com.unciv.ui.utils.* import com.unciv.ui.worldscreen.optionstable.YesNoPopupTable class LoadMapScreen(previousMap: TileMap) : PickerScreen(){ @@ -42,13 +40,20 @@ class LoadMapScreen(previousMap: TileMap) : PickerScreen(){ val rightSideTable = Table().apply { defaults().pad(10f) } val loadFromClipboardButton = TextButton("Load copied data".tr(), skin) - loadFromClipboardButton .onClick { + val couldNotLoadMapLabel = "Could not load map!".toLabel().setFontColor(Color.RED).apply { isVisible=false } + loadFromClipboardButton.onClick { val clipboardContentsString = Gdx.app.clipboard.contents.trim() - val decoded = Gzip.unzip(clipboardContentsString) - val loadedMap = MapSaver().mapFromJson(decoded) - UnCivGame.Current.screen = MapEditorScreen(loadedMap) + try { + val decoded = Gzip.unzip(clipboardContentsString) + val loadedMap = MapSaver().mapFromJson(decoded) + UnCivGame.Current.screen = MapEditorScreen(loadedMap) + } + catch (ex:Exception){ + couldNotLoadMapLabel.isVisible=true + } } rightSideTable.add(loadFromClipboardButton).row() + rightSideTable.add(couldNotLoadMapLabel).row() deleteMapButton.onClick { YesNoPopupTable("Are you sure you want to delete this map?", { diff --git a/core/src/com/unciv/ui/worldscreen/TradePopup.kt b/core/src/com/unciv/ui/worldscreen/TradePopup.kt index 1d37a0e5..5f8dbdf1 100644 --- a/core/src/com/unciv/ui/worldscreen/TradePopup.kt +++ b/core/src/com/unciv/ui/worldscreen/TradePopup.kt @@ -27,8 +27,8 @@ 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.add("[${translatedNation.getNameTranslation()}]'s trade offer".toLabel()) + tradeOffersTable.add("Our trade offer".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())