diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties index 11fe58f986..1842611800 100644 --- a/android/assets/jsons/translations/Catalan.properties +++ b/android/assets/jsons/translations/Catalan.properties @@ -2297,8 +2297,7 @@ for all movement = per a tots els moviments requires [amount] movement = necessita [amount] de moviment costs [stats] stats = costa [stats] costs [amount] [stockpiledResource] = costa [amount] [stockpiledResource] - # Requires translation! -removing the [promotion] promotion/status = +removing the [promotion] promotion/status = traient l’ascens/estat [promotion] once = una vegada [amount] times = [amount] vegades [amount] additional time(s) = [amount] vegades més @@ -2500,14 +2499,10 @@ upon defeating a [mapUnitFilter] unit = quan es derrota una unitat de tipus [map upon expending a [mapUnitFilter] unit = quan es gasta una unitat [mapUnitFilter] upon being defeated = quan la unitat és derrotada upon being promoted = quan la unitat rep un ascens - # Requires translation! -upon gaining the [promotion] promotion = - # Requires translation! -upon losing the [promotion] promotion = - # Requires translation! -upon gaining the [promotion] status = - # Requires translation! -upon losing the [promotion] status = +upon gaining the [promotion] promotion = quan s’obté l’ascens [promotion] +upon losing the [promotion] promotion = quan es perd l’ascens [promotion] +upon gaining the [promotion] status = quan s’obté l’estat [promotion] +upon losing the [promotion] status = quan es perd l’estat [promotion] upon losing at least [amount] HP in a single attack = quan perd com a mínim [amount] PV en un sol atac upon ending a turn in a [tileFilter] tile = quan acaba el torn en una casella de tipus [tileFilter] upon discovering a [tileFilter] tile = quan es descobreix una casella [tileFilter] @@ -2883,7 +2878,7 @@ Monument = Monument Granary = Graner -Temple of Artemis = Temple d’Artemisa +Temple of Artemis = El Temple d’Artemisa 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.' - Robert Louis Stevenson = «No és per la bellesa que els boscos atrauen els cors dels homes, sinó per aquella qualitat subtil de l’aire que emana dels arbres que canvia meravellosament i renova els esperits esgotats». – Robert Louis Stevenson The Great Lighthouse = El Far d’Alexandria @@ -2905,7 +2900,7 @@ Circus = Circ Water Mill = Molí d’aigua -Floating Gardens = Jardins flotants +Floating Gardens = Els Jardins Flotants Walls = Muralla @@ -2921,7 +2916,7 @@ Barracks = Quarter Krepost = Krepost -Statue of Zeus = Estàtua de Zeus +Statue of Zeus = L’Estàtua de Zeus 'He spoke, the son of Kronos, and nodded his head with the dark brows, and the immortally anointed hair of the great god swept from his divine head, and all Olympos was shaken' - The Iliad = «Va parlar el fill de Cronos i assentí amb el cap i les celles fosques i el cabell ungit immortal del cap del gran déu es va moure i tot l’Olimp va tremolar.» - La Ilíada Lighthouse = Far @@ -2933,9 +2928,9 @@ Courthouse = Jutjat Hanging Gardens = Els Jardins Penjants '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 = «Crec que si mai un mortal escoltés la paraula de Déu, seria en un jardí a la fresca.» - F. Frankfort Moore -Colosseum = Coliseu +Colosseum = El Coliseu -Circus Maximus = Circ Màxim +Circus Maximus = El Circ Màxim Great Wall = La Gran Muralla 'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = «L’art de la guerra ens ensenya a no confiar en la possibilitat que l’enemic no ataqui, sinó en el fet que cal que la nostra posició sigui inexpugnable.» - Sun Tzu @@ -2944,9 +2939,9 @@ Temple = Temple Burial Tomb = Tomba -Mud Pyramid Mosque = Mesquita piramidal +Mud Pyramid Mosque = La Mesquita Piramidal -National College = Institut nacional +National College = Institut Nacional The Oracle = L’Oracle 'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing' - Socrates = «L’antic Oracle va dir que era el més savi de tots els grecs. És per això que només jo, d’entre tots els grecs, sé que no sé res.» ‒ Sòcrates @@ -2963,7 +2958,7 @@ Aqueduct = Aqüeducte Heroic Epic = Èpica heroica -Colossus = Colós +Colossus = El Colós 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = «Per què Déu passeja per l’estret món com un colós i nosaltres, homes miserables, caminem per sota les seves cames enormes i anem mirant fins trobar una tomba deshonorable?» ‒ William Shakespeare, Juli Cèsar Garden = Jardins @@ -2998,14 +2993,14 @@ Wat = Wat Oxford University = Universitat d’Oxford -Notre Dame = Catedral de Notre-Dame +Notre Dame = La Catedral de Notre-Dame '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 = «L’arquitectura ha anotat grans idees de la raça humana. No només cada símbol religiós, sinó que cada pensament humà té la seva pàgina en aquest llibre extens.» ‒ Víctor Hugo Castle = Castell Mughal Fort = Fort Vermell -Himeji Castle = Castell Himeji +Himeji Castle = El Castell Himeji 'Bushido is realized in the presence of death. This means choosing death whenever there is a choice between life and death. There is no other reasoning.' - Yamamoto Tsunetomo = «El bushido es realitza en presència de la mort. Això significa que s’ha de triar la mort quan hi ha opció entre vida i mort. No hi ha cap altre raonament.» ‒ Yamamoto Tsunetomo Ironworks = Siderúrgia @@ -3014,14 +3009,14 @@ Armory = Armeria Observatory = Observatori -Opera House = Teatre de l’Òpera +Opera House = El Teatre de l’Òpera Sistine Chapel = La Capella Sixtina 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = «Jo visc i estimo en la peculiar llum de Déu.» ‒ Michelangelo Buonarroti Bank = Banc -Satrap's Court = Cort del Sàtrapa +Satrap's Court = La Cort del Sàtrapa Forbidden Palace = El Palau Prohibit 'Most of us can, as we choose, make of this world either a palace or a prison' - John Lubbock = «Quan triem, molts de nosaltres fem d’aquest món un palau o una presó.» ‒ John Lubbock @@ -3035,7 +3030,7 @@ Hermitage = L’Hermitage Taj Mahal = El Taj Mahal 'The Taj Mahal rises above the banks of the river like a solitary tear suspended on the cheek of time.' - Rabindranath Tagore = «El Taj Mahal s’aixeca per sobre dels marges del riu com una llàgrima solitària a la galta del temps.» ‒ Rabindranath Tagore -Porcelain Tower = Torre de Porcellana +Porcelain Tower = La Torre de Porcellana 'Things always seem fairer when we look back at them, and it is out of that inaccessible tower of the past that Longing leans and beckons.' - James Russell Lowell = «Les coses sempre semblen més justes quan mirem enrere i és fora d’aquesta torre inaccessible del passat que la nostàlgia s’inclina i ens fa senyals.» ‒ James Russell Lowell Windmill = Molí de vent @@ -3068,15 +3063,15 @@ Stock Exchange = Borsa de valors Broadcast Tower = Torre de retransmissió -Eiffel Tower = Torre Eiffel +Eiffel Tower = La Torre Eiffel 'We live only to discover beauty, all else is a form of waiting' - Kahlil Gibran = «Només vivim per descobrir la bellesa; la resta és una espera.» ‒ Kahlil Gibran -Statue of Liberty = Estàtua de la Llibertat +Statue of Liberty = L’Estàtua de la Llibertat 'Give me your tired, your poor, your huddled masses yearning to breathe free, the wretched refuse of your teeming shore. Send these, the homeless, tempest-tossed to me, I lift my lamp beside the golden door!' - Emma Lazarus = «Doneu-me els vostres homes cansats, els vostres pobres, les masses que volen respirar lliures, els desgraciats que no volen quedar-se a les costes plenes de gent. Envieu-me’ls, els que no tenen casa, els que m’envia la tempesta, jo aixeco el meu llum al costat de la porta d’or!» ‒ Emma Lazarus Military Base = Base militar -Cristo Redentor = Crist Redemptor +Cristo Redentor = El Crist Redemptor 'Come to me, all who labor and are heavy burdened, and I will give you rest.' - New Testament, Matthew 11:28 = «Veniu a mi els que treballen i estan molt cansats i us donaré descans.» ‒ Nou Testament, Mateu 11:28 Research Lab = Laboratori de recerca @@ -3089,9 +3084,9 @@ Stadium = Estadi Sydney Opera House = L’Òpera de Sydney 'Those who lose dreaming are lost.' - Australian Aboriginal saying = «Els que deixen de somiar estan perduts.» ‒ Refrany australià aborigen -Manhattan Project = Projecte Manhattan +Manhattan Project = El Projecte Manhattan -Pentagon = Pentàgon +Pentagon = El Pentàgon 'In preparing for battle I have always found that plans are useless, but planning is indispensable.' - Dwight D. Eisenhower = «Preparant-me per la batalla, sempre he trobat que els plans són inútils, però que planificar és indispensable.» ‒ Dwight D. Eisenhower Solar Plant = Planta solar @@ -3102,10 +3097,10 @@ Apollo Program = Programa Apol·lo Spaceship Factory = Fàbrica de naus espacials -United Nations = Nacions Unides +United Nations = Les Nacions Unides 'More than ever before in human history, we share a common destiny. We can master it only if we face it together. And that is why we have the United Nations.' - Kofi Annan = «Més que mai abans en la història de la humanitat, compartim un destí comú. Podem dominar-lo només si ens hi enfrontem junts. I per això tenim les Nacions Unides.» ‒ Kofi Annan -Utopia Project = Projecte Utopia +Utopia Project = El Projecte Utopia #################### Lines from CityStateTypes from Civ V - Vanilla #################### @@ -6755,12 +6750,9 @@ Inquisitor = Inquisidor Introduction = Introducció Welcome to Unciv!\nBecause this is a complex game, there are basic tasks to help familiarize you with the game.\nThese are completely optional, and you're welcome to explore the game on your own! = Us donem la benvinguda a l’Unciv!\nCom és un joc complex, hi ha unes tasques bàsiques perquè us hi familiaritzeu.\nSón completament opcionals i, si voleu, podeu explorar el joc pel vostre compte. - # Requires translation! -Welcome to Unciv! = - # Requires translation! -Because this is a complex game, there are some tutorials to help familiarize you with it. These can be disbaled in the Options -> Display menu, but please hang on if you're new here! = - # Requires translation! -Your first mission is to found your capital city. This is actually an important task because your capital city will probably be your most prosperous. Many game bonuses apply only to your capital city, and it will be the center of your empire. = +Welcome to Unciv! = Us donem la benvinguda a l’Unciv! +Because this is a complex game, there are some tutorials to help familiarize you with it. These can be disbaled in the Options -> Display menu, but please hang on if you're new here! = Com que aquest joc és complex, hi ha uns quants tutorials per tal que us hi familiaritzeu. Es poden desactivar a Opcions → Vídeo → Interfície gràfica, però millor no ho feu si jugueu a aquest joc per primera vegada. +Your first mission is to found your capital city. This is actually an important task because your capital city will probably be your most prosperous. Many game bonuses apply only to your capital city, and it will be the center of your empire. = La vostra missió és fundar la vostra ciutat capital. Es tracta d'una tasca important perquè la capital probablement sigui la vostra ciutat més pròspera. # Requires translation! How do you know a city location is appropriate? Luckily, the game has already chosen a good location for you. You can settle in this place, or maybe move a turn to found on a Hill (for Production and defence) or next to a Mountain (to gain access to the Observatory building later on). = # Requires translation! @@ -6771,8 +6763,7 @@ Luxury resources are tiles that have things like Gems, Cotton, or Silk (indicate Cities will house Citizens, which can work tiles up to 3 tiles away from the city. This means you don’t have to settle cities right on or next to good tiles. Let’s say, for example, that you want access to some Iron – but the resource is in a desert area. You don’t have to settle your city in the desert. You can settle a few tiles away in more prosperous lands. Your city will grow and eventually gain access to the resource. You only need to settle right on top of resources if you need them immediately. = # Requires translation! The first thing coming out of your city depends on the strategy you want to follow, but the 'classic' build order is to build first two Scouts, then a Shrine, and three Settlers, and adopt Tradition, to explore the map quickly (Scouts ignore terrain cost), and to get an early Pantheon (if you're playing with religion enabled). = - # Requires translation! -But feel free to experiment with your own build orders! = +But feel free to experiment with your own build orders! = Sentiu-vos lliure i experimenteu amb les vostres pròpies ordres de construcció! In your first couple of turns, you will have very little options, but as your civilization grows, so do the number of things requiring your attention. = Durant els primers torns, disposareu de poques opcions, però quan la civilització creixi, també ho faran els punts que necessitaran la vostra atenció. @@ -6886,7 +6877,7 @@ Idle Units = Unitats aturades If you don't want to move a unit this turn, you can skip it by clicking 'Next unit' again.\nIf you won't be moving it for a while, you can have the unit enter Fortify or Sleep mode - \n units in Fortify or Sleep are not considered idle units.\nIf you have not decided yet what an unit should do for the current turn, choose the 'Wait' command. A 'waiting' unit will be selected again at the end of the 'Next Unit' cycle, once all other units have received their orders.\nIf you want to disable the 'Next unit' feature entirely, you can toggle it in Menu -> Check for idle units. = Si no voleu moure una unitat aquest torn, feu clic al botó «Següent unitat».\nSi no voleu moure-la durant diversos torns, podeu posar la unitat en mode «Fortifica» o «Dorm».\nLes unitats fortificades o adormides es poden seleccionar de nou al final del cicle de «Següent unitat», una vegada totes les altres unitats han rebut les seves ordres.\nSi no voleu que se us passi per alt alguna unitat fortificada o adormida al final del torn, podeu activar «Comprova les unitats aturades» del menú d'opcions. Contact Me = Contacteu amb mi -Hi there! If you've played this far, you've probably seen that the game is currently incomplete.\n Unciv is meant to be open-source and free, forever.\n That means no ads or any other nonsense. = Hola! Si heu arribat fins aquí, segurament haureu vist que el joc està incomplet.\nL’UnCiv està pensat com a joc de codi obert i lliure per a sempre.\nAixò significa que no hi haurà anuncis ni altres poca-soltades. +Hi there! If you've played this far, you've probably seen that the game is currently incomplete.\n Unciv is meant to be open-source and free, forever.\n That means no ads or any other nonsense. = Hola! Si heu arribat fins aquí, segurament haureu vist que el joc està incomplet.\nL’Unciv està pensat com a joc de codi obert i lliure per a sempre.\nAixò significa que no hi haurà anuncis ni altres poca-soltades. What motivates me to keep working on it, \n besides the fact I think it's amazingly cool that I can,\n is the support from the players - you guys are the best! = El que em motiva a continuar treballant-hi,\n a banda del fet que crec que és genial que pugui fer-ho,\n és el suport dels jugadors ‒sou els millors! Every rating and review that I get puts a smile on my face =)\n So contact me! Send me an email, review, Github issue\n or mail pigeon, and let's figure out how to make the game \n even more awesome!\n(Contact info is in the Play Store) = Cada valoració i ressenya que feu, es rep amb il·lusió.\nAixí que contacteu amb mi! Envieu-me un correu, ressenya, problema a GitHub o un colom missatger i mirarem de fer el joc encara més increïble. @@ -7102,79 +7093,60 @@ If you opened the Civilopedia from the main menu, the "Ruleset" will be that of Letters can select categories, and when there are multiple categories matching the same letter, you can press that repeatedly to cycle between these. = Les lletres permeten triar categories i, quan hi ha diferents categories que es corresponen amb la mateixa lletra, podeu prémer diverses vegades la tecla per a moure-vos-hi de manera cíclica. The arrow keys allow navigation as well - left/right for categories, up/down for entries. = Les tecles de cursor també permeten la navegació: esquerra/dreta per a categories i amunt/avall per a desplaçar-se per les diferents entrades. - # Requires translation! -UI Tips = - # Requires translation! -World screen = - # Requires translation! -Skip all units to end a turn quickly = +UI Tips = Consells d’ús de la interfície +World screen = Vista del món +Skip all units to end a turn quickly = Salta totes les unitats i acaba el torn de pressa # Requires translation! Right-click or long press the "Next unit" button to open a popup menu which allows to end a turn without having to cycle through all units. If some units are automated, a dedicated button is available to move them before ending the turn. = - # Requires translation! -Toggle notification list display = +Toggle notification list display = Mostra/Amaga la llista de notificacions # Requires translation! On the World screen, swipe the notification list to the right to temporarily hide it. Click the "Bell" button to display them again. = # Requires translation! The default state for the notification list can be set in Options > Display > UI - Notifications on world screen. = - # Requires translation! -Entering a city screen quickly = +Entering a city screen quickly = Com entrar a la vista de ciutat de pressa # Requires translation! You can Right-click or long press a city button on the World screen. The result is the same as tapping it twice - once to select and move the button, again to trigger a reaction: show the city screen (if the city is yours to inspect), or offer the foreign city info popup. = - # Requires translation! -Upgrade multiple units of the same type = +Upgrade multiple units of the same type = Com millorar diverses unitats del mateix tipus # Requires translation! On the World screen, select an unit that can be upgraded, then right-click or long press the "Upgrade" button to open a popup menu allowing to upgrade all units of this type at once. = # Requires translation! In the Units overview, the same upgrade menu is available by clicking the unit icon in the "Upgrade" column. When an unit is upgradeable, the icon is lit if conditions are met (enough gold and/or resources), otherwise it is dimmed. = - # Requires translation! -City screen = - # Requires translation! -Additional controls for the construction queue = +City screen = Vista de ciutat +Additional controls for the construction queue = Controls addicionals de la cua de construcció # Requires translation! Right-click or long press a construction item to open a popup menu with additional controls, allowing to manage production of the same item in all cities, by issuing the commands from the same City screen. = # Requires translation! The "Disable" option moves an item to a separated "Disabled" tab, preventing its automatic queueing by the "Auto-assign city production" option. To move a disabled item back to its initial place, enter again the popup menu, and choose "Enable". = # Requires translation! Disabled items are set globally and persistent: they are not reset in a new game, or by restarting Unciv. = - # Requires translation! -Show Great Person Points breakdown = +Show Great Person Points breakdown = Mostra un resum dels punts de Gran Personatge # Requires translation! In the right sidepanel, click a Great People row to display the details of Great Person Points (GPP) accumulated each turn by the current city, for this type of Great People. = # Requires translation! Click any of the Great People icons to display all GPP accumulated each turn by the current city, for all types of Great People. = - # Requires translation! -Tech screen = - # Requires translation! -Queue multiple technologies in different branches = +Tech screen = Vista de tecnologies +Queue multiple technologies in different branches = Posa a la cua diverses tecnologies de branques diferents # Requires translation! On the Tech screen, right-click or long press a technology to automatically queue it, even if this tech is in another branch than the item currently researched. Prerequisite techs to research will also be automatically queued. = # Requires translation! Right-click or long press multiple techs to append them to the research queue, whatever their branch is. = - # Requires translation! -Overview screens = - # Requires translation! -Reveal known resources on world screen = +Overview screens = Vistes generals +Reveal known resources on world screen = Mostra els recursos coneguts a la vista del món # Requires translation! In the Resources overview, click on a resource icon to center the world screen on tiles already discovered and providing this resource. = # Requires translation! Alternatively, click on the "Unimproved" number to center the world screen only on owned (by you or your allied City-states) tiles where the resource is not improved. = - # Requires translation! -If more than one tile is available, click repeatedly on the notification to cycle through all of them. = - # Requires translation! -Show diagram line colors = +If more than one tile is available, click repeatedly on the notification to cycle through all of them. = Si hi ha més d’una casella disponible, feu clic diverses vegades a la notificació per a passar per totes elles. +Show diagram line colors = Mostra els colors de les línies del diagrama # Requires translation! In Politics overview > Show diagram, you can click anywhere inside the diagram to display a table listing all relationship line colors and their meaning. = - # Requires translation! -Miscellaneous = - # Requires translation! -External links = +Miscellaneous = Miscel·lània +External links = Enllaços externs # Requires translation! External links support right-click or long press to copy the link to the clipboard instead of launching the browser. = - # Requires translation! -Example: The 'Open Github page' button on the Mod management screen. = +Example: The 'Open Github page' button on the Mod management screen. = Exemple: El botó «Obre la pàgina de GitHub» de la vista de gestió de mods. - # Requires translation! -Differences from Civilization V = +Differences from Civilization V = Diferències amb el Civilization V # Requires translation! Production Focus\nIn Civilization V, the Food yield in a city is calculated first, then population grows by consuming stored food (growth), then production is calculated, and so on one by one the other stats are calculated. Thus, citizens can produce yields in the same turn as they are born. The city focus is set to Production to assign the newborn citizen to a hill so they'll contribute Production, and then manually reassigned to a growth tile on the next turn. Alternatively, you can set city focus to Gold (e.g. with Cerro de Potosi), Faith (e.g. with Mount Sinai) or whatever gains the most yields. In Unciv, citizens only start producing yields on the next turn, so you can ignore this whole concept = # Requires translation! diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index bb89edd561..618865af28 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -1131,7 +1131,7 @@ due to adopting [policy] = grâce à l'adoption de [policy] due to discovering [naturalWonder] = grâce à la découverte de [naturalWonder] due to entering the [eraName] = grâce à l'entrée dans [eraName] due to constructing [buildingName] = grâce à la construction de [buildingName] -due to gaining a [unitName] = pour avoir gagné un(e) [unitName] +due to gaining a [unitName] = pour avoir obtenu un(e) [unitName] due to founding a city = pour avoir fondé une ville due to discovering a Natural Wonder = grâce à la découverte d'une Merveille Naturelle due to our [unitName] defeating a [otherUnitName] = car notre [unitName] a vaincu un(e) [otherUnitName] @@ -2502,9 +2502,9 @@ upon being promoted = en étant promu(e) upon gaining the [promotion] promotion = en obtenant la promotion [promotion] upon losing the [promotion] promotion = en perdant la promotion [promotion] # Requires translation! -upon gaining the [promotion] status = +upon gaining the [promotion] status = en obtenant le statut [promotion] # Requires translation! -upon losing the [promotion] status = +upon losing the [promotion] status = en perdant le statut [promotion] upon losing at least [amount] HP in a single attack = en perdant au moins [amount] PV en une seule attaque upon ending a turn in a [tileFilter] tile = en terminant un tour sur une case [tileFilter] upon discovering a [tileFilter] tile = en découvrant une case [tileFilter] diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 8fb21bc540..49e95da214 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -258,7 +258,8 @@ Declare Protection of [cityStateName]? = 宣布保護[cityStateName]嗎？ Build [improvementName] on [resourceName] (200 Gold) = 在[resourceName]建造[improvementName]（200 金錢） Gift Improvement = 禮品改進 # Requires translation! -[civName] is able to provide [unitName] once [techName] [isOrAre] researched. = +[civName] is able to provide [unitName] once [techName] [isOrAre] researched. = 若[isOrAre][techName]已被研發，則[civName]將能夠提供[unitName]。 +# A workaround here. is = 是 are = 是 @@ -1593,32 +1594,33 @@ Average = 平均 Worst = 最差 # The \n here means: put a newline (enter) here. If this is omitted, the sidebox in the diplomacy overview will become _really_ wide. # Feel free to replace it with a space and put it between other words in your translation -Turns until the next\ndiplomacy victory vote: [amount] = 在下一次投票\n外交勝利票數：[amount] +Turns until the next\ndiplomacy victory vote: [amount] = 距離下次外交勝利投票\n尚有[amount]回合 +# See Choose a civ to vote for = 投票給所選文明 Choose who should become the world leader and win a Diplomatic Victory! = 選擇誰應該成為世界領袖並贏得外交勝利！ Vote for [civilizationName] = 投票給[civilizationName] Vote for World Leader = 投票給世界領袖 # Requires translation! -Abstain = +Abstain = 棄權 Continue = 繼續 Abstained = 棄權 Voted for = 投給了 # Requires translation! -[number] votes = +[number] votes = [number] 票 # Requires translation! -[number] vote = +[number] vote = [number] 票 # Requires translation! -No valid votes were cast. = +No valid votes were cast. = 有效票數為零。 # Requires translation! -Minimum votes for electing a world leader: [number] = +Minimum votes for electing a world leader: [number] = 世界領袖最低當選票數：[number] # Requires translation! -Tied in first position: [civNames] = +Tied in first position: [civNames] = 票數相同：[civNames] # Requires translation! -No world leader was elected. = +No world leader was elected. = 未選出世界領袖。 # Requires translation! -You have been elected world leader! = +You have been elected world leader! = 您已經被票選為世界領袖！ # Requires translation! -[leaderName] of [civ] has been elected world leader! = +[leaderName] of [civ] has been elected world leader! = [civ]的[leaderName]已被選為世界領袖！ Replay = 重播 # Capturing a city @@ -2372,7 +2374,7 @@ requires [amount] movement = （需要[amount]移動力） costs [stats] stats = 以[stats]為代價 costs [amount] [stockpiledResource] = 以消耗[amount]單位[stockpiledResource]為代價 # Requires translation! -removing the [promotion] promotion/status = +removing the [promotion] promotion/status = 移除[promotion]狀態/晉升 once = 僅有一次機會 [amount] times = 有 [amount] 次機會 [amount] additional time(s) = 有額外 [amount] 次機會 @@ -2575,13 +2577,13 @@ upon expending a [mapUnitFilter] unit = 每當消耗[mapUnitFilter]單位時 upon being defeated = 被擊敗時 upon being promoted = 被晉升時 # Requires translation! -upon gaining the [promotion] promotion = +upon gaining the [promotion] promotion = 當獲得[promotion]晉升時 # Requires translation! -upon losing the [promotion] promotion = +upon losing the [promotion] promotion = 當失去[promotion]晉升時 # Requires translation! -upon gaining the [promotion] status = +upon gaining the [promotion] status = 當獲得[promotion]狀態時 # Requires translation! -upon losing the [promotion] status = +upon losing the [promotion] status = 當失去[promotion]狀態時 upon losing at least [amount] HP in a single attack = 每當在單次戰鬥中失去至少 [amount] HP時 upon ending a turn in a [tileFilter] tile = 每當在[tileFilter]地塊上結束回合時 upon discovering a [tileFilter] tile = 每當發現[tileFilter]地塊時 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index e45c932447..646748af12 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -4,8 +4,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.9.24" const val appName = "Unciv" - const val appCodeNumber = 1054 - const val appVersion = "4.13.12" + const val appCodeNumber = 1055 + const val appVersion = "4.13.13" const val gdxVersion = "1.12.1" const val ktorVersion = "2.3.12" diff --git a/changelog.md b/changelog.md index 8eec32a531..c71e46aa38 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,17 @@ +## 4.13.13 + +Homework from @SomeTroglodyte - Remove lastOverviewPage and replace with persistState.last + +Minimized MP game update IO by ignoring games older than 2 weeks for 'update all' + +Resolved ANRs when pausing game due to game clone time + +Resolved ANRs when starting a new game (checking for multuplayer server connection) + +Protect terrainImage against incorrectly configured mods (natural wonder turnsInto is not in ruleset) + +Resolved race-condition error for loading terrain icons + ## 4.13.12 Cannot have 2 research agreements at once due to counteroffers diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 44d64cad33..76ab3fdbe1 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -483,7 +483,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci companion object { //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT - val VERSION = Version("4.13.12", 1054) + val VERSION = Version("4.13.13", 1055) //endregion /** Global reference to the one Gdx.Game instance created by the platform launchers - do not use without checking [isCurrentInitialized] first. */ diff --git a/fastlane/metadata/android/en-US/changelogs/1055.txt b/fastlane/metadata/android/en-US/changelogs/1055.txt new file mode 100644 index 0000000000..4e2af056c6 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/1055.txt @@ -0,0 +1,13 @@ + + +Homework from @SomeTroglodyte - Remove lastOverviewPage and replace with persistState.last + +Minimized MP game update IO by ignoring games older than 2 weeks for 'update all' + +Resolved ANRs when pausing game due to game clone time + +Resolved ANRs when starting a new game (checking for multuplayer server connection) + +Protect terrainImage against incorrectly configured mods (natural wonder turnsInto is not in ruleset) + +Resolved race-condition error for loading terrain icons \ No newline at end of file