Version rollout (#12955)

* Bump version and create initial changelog entry * Update Simplified_Chinese.properties (#12954) * Add files via upload * Update Simplified_Chinese.properties * Update Spanish.properties (#12953) * Update Thai.properties (#12950) * Update Thai.properties * Update Thai.properties * A little help with the translation into pt-br (#12948) * A little help with the translation into pt-br * Update Brazilian_Portuguese.properties Fixed a spell error [outUnit] to [ourUnit] It should work correctly now * Update Polish.properties (#12947) * Update French.properties (#12944) * Update Indonesian.properties (#12942) Translation and corrections. * Update Croatian translation (#12940) * translate new lines * corrections * Update Italian.properties (#12938) --------- Co-authored-by: yairm210 <yairm210@users.noreply.github.com> Co-authored-by: AutumnPizazz <114050365+AutumnPizazz@users.noreply.github.com> Co-authored-by: Nahuel Geno <142752140+NahuelGeno@users.noreply.github.com> Co-authored-by: Stevekun321 <95151822+Stevekun321@users.noreply.github.com> Co-authored-by: -Kayk_Caputo- <49660516+KaykCaputo@users.noreply.github.com> Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com> Co-authored-by: Ouaz <Ouaz@users.noreply.github.com> Co-authored-by: X2003 <158255876+Xenia2003@users.noreply.github.com> Co-authored-by: metablaster <44481081+metablaster@users.noreply.github.com> Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2025-09-23 03:23:17 -04:00 · 2025-02-13 21:19:30 +02:00 · 2025-02-13 21:19:30 +02:00 · 93701b80a1
commit 93701b80a1
parent 2a8edb3af0
14 changed files with 604 additions and 592 deletions
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@ -97,9 +97,9 @@ Requires [buildingName] to be built in the city = Requer que [buildingName] este
 Requires [buildingName] to be built in all cities = Requer que [buildingName] tenha sido construído em todas as cidades
 Provides a free [buildingName] in the city = Fornece um(a) [buildingName] grátis na cidade
 # Requires translation!
-Requires improved [resource] near city = 
+Requires improved [resource] near city = Requer um(a) [resource] próximo a cidade
 # Requires translation!
-Requires at least one of the following resources improved near the city: = 
+Requires at least one of the following resources improved near the city: = Requer pelo menos um dos seguintes recursos proximos a cidade
 Wonder is being built elsewhere = Maravilha está sendo construída em outra cidade
 National Wonder is being built elsewhere = Maravilha Nacional está sendo construída em algum lugar.
 Requires a [buildingName] in all [cityFilter] cities = Requer um(a) [buildingName] em todas as [cityFilter] cidades
@ -391,7 +391,7 @@ Custom = Customizado
 Map Generation Type = Tipo de geração de mapa
 Enabled Map Generation Types = Tipos de geração de mapas ativados
 # Requires translation!
-Example map = 
+Example map = Mapa de demonstração

 # Map types
 Default = Padrão
@ -996,12 +996,12 @@ Your citizens are revolting due to very high unhappiness! = Seus cidadãos estã

  
 # Requires translation!
-An enemy [unit] has attacked [cityName] ([amount2] HP) = 
+An enemy [unit] has attacked [cityName] ([amount2] HP) = Um(a) [unit] inimiga atacou [cityName] ([amount2] HP)
 An enemy [unit] ([amount] HP) has attacked [cityName] ([amount2] HP) = Um(a) [unit] inimigo(a) ([amount] HP) atacou [cityName] ([amount2] HP)
 An enemy [unit] ([amount] HP) has [battleAction] our [ourUnit] ([amount2] HP) = Um(a) [unit] inimigo(a) ([amount] HP) [battleAction] nosso(a) [ourUnit] ([amount2] HP)
 An enemy [unit] has attacked our [ourUnit] ([amount] HP) = Um(a) [unit] inimigo(a) atacou nosso(a) [ourUnit] ([amount] HP)
 # Requires translation!
-An enemy [unit] ([amount] HP) has attacked our [ourUnit] ([amount2] HP) = 
+An enemy [unit] ([amount] HP) has attacked our [ourUnit] ([amount2] HP) = Um(a) [unit] ([amount] HP) atacou nosso(a) [ourUnit] ([amount2] HP)
 Enemy city [cityName] has attacked our [ourUnit] = A cidade inimiga [cityName] atacou nosso(a) [ourUnit]
 Enemy city [cityName] has attacked our [ourUnit] ([amount2] HP) = A cidade inimiga [cityName] atacou nosso(a) [ourUnit] ([amount2] HP)
 An enemy [unit] has captured [cityName] = Um(a) [unit] inimigo(a) capturou [cityName]
@ -1186,9 +1186,9 @@ Next unit = Próxima unidade
 [amount] units idle = [amount] unidades ociosas
 [idleCount] idle = [idleCount] ocioso
 # Requires translation!
-[skipCount] skipping = 
+[skipCount] skipping = [skipCount] pulando
 # Requires translation!
-Cycle = 
+Cycle = Ciclo
 Fog of War = Névoa de guerra
 Pick a policy = Escolha uma política
 Move Spies = Mover Espiões
@ -1239,7 +1239,7 @@ Pillage [improvement] = Saquear [improvement]
 [improvement] (Pillaged!) = [improvement] (Saqueado!)
 Repair [improvement] - [turns] = Reparar [improvement] - [turns]
 # Requires translation!
-Skip turn = 
+Skip turn = Pular turno
 Are you sure you want to pillage this [improvement]? = Tem certeza de que deseja saquear esta [improvement]?
 We have looted [amount] from a [improvement] = Saqueamos [amount] de uma [improvement]
 We have looted [amount] from a [improvement] which has been sent to [cityName] = Saqueamos [amount] de um [improvement] que foi enviada para [cityName]
--- a/android/assets/jsons/translations/Croatian
+++ b/android/assets/jsons/translations/Croatian
@ -20,11 +20,11 @@ This document provides short hints only for Croatian translation and is by no me
  - [Placeholder genders](#placeholder-genders)
    - [Feminine](#feminine)
    - [Masculine](#masculine)
-    - [Third gender](#third-gender)
+    - [Neuter](#neuter)
    - [Mixed gender](#mixed-gender)
    - [Guess gender](#guess-gender)
-    - [Unresolved gender](#unresolved-gender)
    - [Gender not applicable](#gender-not-applicable)
+    - [Unresolved gender](#unresolved-gender)
  - [City names](#city-names)
    - [Cities written in English](#cities-written-in-english)
    - [Cities written in Latin letter](#cities-written-in-latin-letter)
@ -43,7 +43,8 @@ Words in this section are difficult to translate properly or difficult for consi
 Choice of words for consistent translation in order of preference and depending on context.</br>
 First highlighted word is used and additional highlighted words are only hints, and may be used
 either depending on context or by replacing all matching alternative words as applicable.</br>
-Words in parentheses are incorrect because English translation has another word.</br>
+Words in parentheses are incorrect either because English translation has another word, or because
+we already use them to translate some other English word in translation file.</br>
 Words outside parentheses are hints as to when highlighted word should be used.

 ### Resolved Translation
@ -131,7 +132,8 @@ Not yet translated words, mostly because no sane translation exits to Croatian l
 - Place `Postavi`
 - Gift `Poklon`, `Dar`
 - Supply `Opskrba`
- Consume(s)/Consuming `Troši/Potrošnja`, `Iskoristiti` stvar, pojava, `Konzumiranje` biće
+- Consume(s)/Consuming `Konzumira/Konzumirati`, `Troši/Potrošnja`, `Iskoristiti`
+- Spend(s) `Troši/Potrošnja`, `Provoditi`
 - Move `Pokreni`, `Pomakni`, `Premjesti`
 - Movement `Kretnja`, `Pokret`
 - Chance `Šansa`, `Vjerojatnost`
@ -243,7 +245,7 @@ Exceptions (use sparingly to retain consistency):

 NOTE: Switching from formal and informal is used in diplomacy

-Examples (formal vs informal):
+Examples (formal vs informal, to check for correct usage e.g. in combination with placeholders):

 - Vi vs Ti
 - Vas vs Tebe, te
@ -275,9 +277,7 @@ Use regex for quick find, e.g. for `*iš`:

 ### Grammatical gender

-TODO: Not fully checked
-
-Examples:
+Examples (to check for correct usage e.g. in combination with placeholders):

 - Naš vs Naša
 - Našim vs Našom
@ -289,12 +289,14 @@ Examples:
 - Njihovim vs Njihovom
 - Njihovog vs Njihove

+TODO: Usage not fully checked:
+
 - `(a)`, `(la)`, `(ica)`, `(ice)`, `(kinjo)`, `(icom)`, `(jela)`, `(na)`, `(om)`, `(icom)` (All feminine)
 - `*io`, `*la`

 Exceptions:

- Use 3rd gender where appropriate to avoid grammatical gender
+- Use neuter where appropriate to avoid grammatical gender

 ### Other grammar

@ -328,6 +330,7 @@ When grammatical gender around a placeholder is needed we use majority gender of
 - [currentPlayerCiv]
 - [unitType]
 - [civ], [civ1], [civ2]
+- [civilization]

 Feminine but not applicable:

@ -354,7 +357,6 @@ Feminine but not applicable:
 - [cityFilter]
 - [cityState]
 - [cityStateName]
- [resource]
 - [resources]
 - [greatPerson]
 - [specialist]
@ -373,7 +375,7 @@ Masculine but not applicable:
 - [populationFilter]
 - [battleAction]

-### Third gender
+### Neuter

 - [era]
 - [eraName]
@ -383,7 +385,7 @@ Masculine but not applicable:

 ### Mixed gender

-Use 3rd gender in translation:
+Use neuter in translation:

 - [wonder]
 - [buildingName]
@ -401,8 +403,9 @@ Use 3rd gender in translation:
 - [techName]
 - [technologyName]
 - [building]
+- [resource]

-Mixed but use 3rd and masculine gender (depending on context) but not feminine:
+Mixed but use neuter or masculine (depending on context) but not feminine:

 - [nukeType]

@ -423,14 +426,7 @@ Try to guess gender depending on context:
 - [countable], [countable2], [countable3]
 - [policy]
 - [code]
-
-### Unresolved gender
-
-TODO: Which gender are these?</br>
-TODO: There are more placeholders in properties not handled here.
-
- [costOrStrength]
- [param]
+- [name]

 ### Gender not applicable

@ -448,9 +444,24 @@ TODO: There are more placeholders in properties not handled here.
 - [version]
 - [title]
 - [naturalWonder]
- [name]
 - [thingToProduce]
 - [thingToSelect]
+- [count]
+- [influenceAmount]
+- [amountOfCulture]
+- [firstValue]
+- [secondValue]
+- [questName]
+
+### Unresolved gender
+
+TODO: Which gender are these?</br>
+TODO: There are more placeholders in properties not listed here.
+
+- [costOrStrength]
+- [param]
+- [valueType]
+- [ability]

 [Table of Contents](#table-of-contents)

@ -525,17 +536,18 @@ TODO: Which letter was historically used by these? classify them and verify tran

 ## Resources

-The following resources were helpful for translation of cities and personal names:
+The following resources were helpful for translation of cities and person names:

 ### Hints

- wikipedia
- google maps in local language first (origin country of a city), google maps in Croatian language if local language
+- Wikipedia
+- Google maps in local language first (origin country of a city), google maps in Croatian language if local language
  letter is not Latin
- search engines
+- Multiple search engines, meta search engines
 - The Bible (e.g. Babylonian and Egyptian cities)
- Country local lexicons
+- Country local lexicons, preferably state official lexicons
 - Deep web
+- Sample articles in Croatian or English language using a word or term which is to be translated

 ### Links

@ -550,6 +562,8 @@ The following resources were helpful for translation of cities and personal name
 - [Geek pravopis](https://geek.hr/pravopis/)
 - [Encyclopedia Iranica](https://iranicaonline.org/)

+- TODO: Reference of comprehensive transliteration rules
+
 [Table of Contents](#table-of-contents)

 ## Gotcha's
@ -563,4 +577,9 @@ The following resources were helpful for translation of cities and personal name
 - Note that other slavic countries like Serbia, Macedonia, Slovakia etc. use different transliteration
  rules so they're not appropriate for translation but exceptions exist that can help. (e.g by using wikipedia)

+- TODO: Where possible avoid "da" (dakavica) and "bude/budu" etc.
+  Note that some cases are orthographically correct.
+
+- Avoid anglicisms, germanisms and other borrowed words unless there is no actual Croatian equivalent
+
 [Table of Contents](#table-of-contents)
--- a/android/assets/jsons/translations/Croatian.properties
+++ b/android/assets/jsons/translations/Croatian.properties
@ -97,9 +97,9 @@ Requires [buildingName] to be built in the city = Zahtijeva da [buildingName] bu
 Requires [buildingName] to be built in all cities = Zahtijeva da [buildingName] bude izgrađeno u svim gradovima
 Provides a free [buildingName] in the city = Pruža besplatno [buildingName] u gradu
 # Requires translation!
-Requires improved [resource] near city = 
+Requires improved [resource] near city = Zahtijeva unaprijeđeno [resource] u blizini grada
 # Requires translation!
-Requires at least one of the following resources improved near the city: = 
+Requires at least one of the following resources improved near the city: = Zahtijeva barem jedan od sljedećih unaprijeđenih resursa u blizini grada:
 Wonder is being built elsewhere = Čudo se gradi negdje drugdje
 National Wonder is being built elsewhere = Nacionalno Čudo se gradi negdje drugdje
 Requires a [buildingName] in all [cityFilter] cities = Zahtijeva [buildingName] u svim [cityFilter] gradovima
@ -107,7 +107,7 @@ Requires a [buildingName] in at least [amount] of [cityFilter] cities = Zahtijev
 [buildingName] required: = Potrebno [buildingName]:
 Requires a [buildingName] in this city = Zahtijeva [buildingName] u ovom gradu
 Cannot be built with [buildingName] = Ne može se graditi s [buildingName]
-Consumes [amount] [resource] = Troši [amount] [resource]
+Consumes [amount] [resource] = Konzumira [amount] [resource]
 Need [amount] more [resource] = Treba [amount] više [resource]
 [amount] available = [amount] dostupno
 Required tech: [requiredTech] = Potrebna tehnologija: [requiredTech]
@ -207,7 +207,7 @@ Favorable = Povoljan
 Friend = Prijatelj
 Ally = Saveznik

-[questName] (+[influenceAmount] influence) = [questName] (+[influenceAmount] utjecaj)
+[questName] (+[influenceAmount] influence) = [questName] (+[influenceAmount] utjecaja)
 [remainingTurns] turns remaining = [remainingTurns] poteza preostalo
 Current leader(s): [leaders] = Trenutačni vođa(e): [leaders]
 Current leader(s): [leaders], you: [yourScore] = Trenutačni vođa(e): [leaders], vi: [yourScore]
@ -378,7 +378,7 @@ Map Options = Opcije Karte
 Game Options = Opcije Igre
 Civilizations = Civilizacije
 # Requires translation!
-Shuffle Civ Order at Start = 
+Shuffle Civ Order at Start = Promiješaj Redoslijed Civilizacija na Početku
 Map Type = Tip Karte
 Map file = Datoteka karte
 Max Turns = Maksimalno poteza
@ -818,7 +818,7 @@ Visible = Vidljivo
 Permanent = Trajno

 # Requires translation!
-Show minimap = 
+Show minimap = Pokaži mini kartu

 Show tutorials = Pokaži poduke
 Reset tutorials = Resetiraj poduke
@ -855,7 +855,7 @@ Check for idle units = Provjeri jedinice u stanju mirovanja
 'Next unit' button cycles idle units = Gumb 'Sljedeća jedinica' kruži kroz jedinice u stanju mirovanja
 Auto Unit Cycle = Automatsko Kruženje Kroz Jedinice
 # Requires translation!
-Show Small Skip/Cycle Unit Button = 
+Show Small Skip/Cycle Unit Button = Pokaži Mali Gumb Preskoči/Kruži Jedinicu
 Move units with a single tap = Pomiči jedinice jednim dodirom
 Move units with a long tap = Pomiči jedinice dugim dodirom
 Auto-assign city production = Automatski dodijeli proizvodnju u gradovima
@ -1653,12 +1653,12 @@ Placed on [terrainType] = Postavlja se na [terrainType]
 Can be found on = Može se pronaći na
 Improved by [improvement] = Unaprjeđeno s [improvement]
 Bonus stats for improvement = Dodatna statistika za unaprjeđenje
-Buildings that consume this resource = Zgrade koje troše ovaj resurs
+Buildings that consume this resource = Zgrade koje konzumiraju ovaj resurs
 Buildings that provide this resource = Zgrade koje pružaju ovaj resurs
 Improvements that provide this resource = Unaprjeđenja koja pružaju ovaj resurs
 # Requires translation!
-Buildings that require this resource improved near the city = 
-Units that consume this resource = Jedinice koje troše ovaj resurs
+Buildings that require this resource improved near the city = Zgrade koje zahtijevaju ovaj resurs unaprijeđen u blizini grada
+Units that consume this resource = Jedinice koje konzumiraju ovaj resurs
 Can be built on = Može se izgraditi na
 Cannot be built on = Ne može se izgraditi na
 or [terrainType] = ili [terrainType]
@ -2088,7 +2088,7 @@ Allied City-States provide [stat] equal to [relativeAmount]% of what they produc
 City-State Influence recovers at twice the normal rate = Utjecaj Grada-Država oporavlja se dvostruko brže od normalne stope
 [relativeAmount]% growth [cityFilter] = [relativeAmount]% rasta [cityFilter]
 [amount]% Food is carried over after population increases [cityFilter] = [amount]% Hrane se prenosi nakon povećanja stanovništva [cityFilter]
-[relativeAmount]% Food consumption by specialists [cityFilter] = [relativeAmount]% Potrošnje hrane od strane specijalista [cityFilter]
+[relativeAmount]% Food consumption by specialists [cityFilter] = [relativeAmount]% konzumacije Hrane od strane specijalista [cityFilter]
 [relativeAmount]% unhappiness from the number of cities = [relativeAmount]% nezadovoljstva od broja gradova
 [relativeAmount]% Unhappiness from [populationFilter] [cityFilter] = [relativeAmount]% Nezadovoljstva od [populationFilter] [cityFilter]
 [amount] Happiness from each type of luxury resource = [amount] Zadovoljstva iz svake vrste luksuznih resursa
@ -2485,7 +2485,7 @@ Free Technology = Besplatna Tehnologija
 Reveals the entire map = Otkriva cijelu kartu
 Gain a free [beliefType] belief = Dobijte besplatno [beliefType] vjerovanje
 Triggers voting for the Diplomatic Victory = Okida glasovanje za diplomatsku pobjedu
-Instantly consumes [positiveAmount] [stockpiledResource] = Instantno troši [positiveAmount] [stockpiledResource]
+Instantly consumes [positiveAmount] [stockpiledResource] = Instantno konzumira [positiveAmount] [stockpiledResource]
 Instantly provides [positiveAmount] [stockpiledResource] = Instantno pruža [positiveAmount] [stockpiledResource]
 Instantly gain [amount] [stockpile] = Instantno dobijte [amount] [stockpile]
 Gain [amount] [stat] = Dobijte [amount] [stat]
@ -3437,7 +3437,7 @@ Would you be interested in a trade agreement with England? = Dali bi bio(la) zai
 Hello, again. = Pozdrav, još jednom.
 Oh, it's you! = Oh, to si ti!
 Sun Never Sets = Sunce Nikad ne Zalazi
-Long live to Your Highness, Queen Elizabeth Gloriana, leader and protector of the glorious England! Through history, enduring many invasions, England strengthened its will, playing smartly with diplomacy, cunning, and military power, to eventually rose as one of the most dominant Empires the world has ever known. Their matchless navy, brilliant scientists and artists, and powerful merchants, have shaped the known world for centuries. = Živjela Tvoja Visost, Kraljice Elizabeta Gloriana, vođa i zaštitnica slavne Engleske! Kroz povijest, podnoseći mnoge invazije, Engleska je ojačala svoju volju, igrajući se pametno diplomacijom, lukavošću i vojnom moći, da bi se na kraju uzdigla kao jedno od najdominantnijih Carstava koje je svijet ikada vidio. Njihova neuporediva mornarica, briljantni znanstvenici i umjetnici te moćni trgovci stoljećima su oblikovali poznati svijet.
+Long live to Your Highness, Queen Elizabeth Gloriana, leader and protector of the glorious England! Through history, enduring many invasions, England strengthened its will, playing smartly with diplomacy, cunning, and military power, to eventually rose as one of the most dominant Empires the world has ever known. Their matchless navy, brilliant scientists and artists, and powerful merchants, have shaped the known world for centuries. = Živjela Tvoja Visost, Kraljice Elizabeta Gloriana, vođa i zaštitnica slavne Engleske! Kroz povijest, podnoseći mnoge invazije, Engleska je ojačala svoju volju, igrajući se pametno diplomacijom, lukavošću i vojnom moći, da bi se na kraju uzdigla kao jedno od najdominantnijih Carstava koje je svijet ikada vidio. Njihova neusporediva mornarica, briljantni znanstvenici i umjetnici te moćni trgovci stoljećima su oblikovali poznati svijet.
 Queen Elizabeth, will England cast once more its brightness upon all lands and seas of the world? Will your new empire shine through the ages of history? = Kraljice Elizabeto, hoće li Engleska još jednom baciti svoj sjaj na sve zemlje i mora svijeta? Hoće li tvoje novo carstvo sjati kroz stoljeća povijesti?
 London = London
 York = York
@ -6918,13 +6918,13 @@ Units are defenseless while embarked (cannot use modifiers), and have a fixed De

 Idle Units = Jedinice u Stanju Mirovanja
 # Requires translation!
-Clicking 'Next unit' moves to the next idle unit in the queue (as listed in Overview -> Units). After issuing an order to an unit, if 'Auto Unit Cycle' in Options -> Gameplay is enabled, you will automatically select the next idle unit. = 
+Clicking 'Next unit' moves to the next idle unit in the queue (as listed in Overview -> Units). After issuing an order to an unit, if 'Auto Unit Cycle' in Options -> Gameplay is enabled, you will automatically select the next idle unit. = Klikom na "Sljedeća jedinica" prelazi se na sljedeću jedinicu u stanju mirovanja u redu čekanja (kako je navedeno u Pregled -> Jedinice). Nakon izdavanja naređenja jedinici, ako je 'Automatsko Kruženje Kroz Jedinice' u Opcije -> Igranje omogućeno, automatski ćete odabrati sljedeću jedinicu u stanju mirovanja.
 If you don't want to move a unit this turn, you can skip it by clicking 'Next unit' again, or command the unit to 'Skip turn'. = Ako ne želite pomicati jedinicu ovaj potez, možete ju preskočiti klikom na "Sljedeća jedinica" ili narediti jedinici da "Preskoči potez".
 # Requires translation!
-If you want to disable the 'Next unit' feature entirely, you can toggle it in Options -> Gameplay -> Check for idle units. = 
+If you want to disable the 'Next unit' feature entirely, you can toggle it in Options -> Gameplay -> Check for idle units. = Ako želite u potpunosti onemogućiti značajku 'Sljedeća jedinica', možete je uključiti/isključiti u Opcije -> Igranje -> Provjeri jedinice u stanju mirovanja.
 If you'd rather 'Next unit' cycle the units and not mark them as Done, you can change it in the Options -> Gameplay menu. = Ako biste radije da "Sljedeća jedinica" kruži kroz jedinice a da ih ne označi kao Gotovo, možete je promijeniti u izborniku Opcije -> Igranje.
 # Requires translation!
-You can also cycle through the idle units using the left and right triangles on the Unit Table in the lower left of the screen. Or by default using the Cycle button next to the 'Next Unit' button. = 
+You can also cycle through the idle units using the left and right triangles on the Unit Table in the lower left of the screen. Or by default using the Cycle button next to the 'Next Unit' button. = Također možete kružiti kroz jedinice u stanju mirovanja koristeći lijevi i desni trokut na Tablici Jedinice u donjem lijevom kutu zaslona. Ili prema zadanim postavkama pomoću gumba Kruži pored gumba 'Sljedeća jedinica'.

 Contact Me = Kontaktirajte Me
 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. = Pozdrav! Ako ste igrali do sada, vjerojatno ste vidjeli da je igra trenutačno nedovršena.\n Unciv je namijenjen da bude otvorenog koda i besplatan, zauvijek.\n To znači da nema reklama ili bilo koje druge gluposti.
@ -7192,7 +7192,7 @@ Example: The 'Open Github page' button on the Mod management screen. = Primjer:

 Differences from Civilization V = Razlike u usporedbi s Civilizacijom V
 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. = Fokus proizvodnje\nU Civilizaciji V, prvo se izračunava količina hrane u gradu, zatim populacija raste konzumiranjem uskladištene hrane (rast), zatim se izračunava proizvodnja, i tako jedna po jedna izračunavaju se ostale statistike. Dakle, građani mogu proizvoditi prinose u istom potezu kada su rođeni. Fokus grada postavljen je na Proizvodnju kako bi se novorođenog građanina dodijelilo na brdo kako bi doprinio Proizvodnji, a zatim se ručno premješta na polje rasta u sljedećem potezu. Alternativno, možete postaviti fokus grada na Zlato (npr. s Cerro de Potosi), Vjeru (npr. s Sinajsko Brdo) ili bilo što, što ima najviše prinosa. U Unciv-u, građani počinju proizvoditi prinose tek u sljedećem potezu, tako da možete zanemariti cijeli ovaj koncept
-Science Queueing\nIn Civilization V, Science yield is calculated after production, so if you finish an item and have Science (or Gold) queued as a perpetual construction, the Production overflow from item will be converted into Science (or Gold), but the Production is not consumed, as this will only happen again on the next turn. By immediately swapping out your perpetual construction for an item on the next turn, you'll get this Science (or Gold) for free. This doesn't apply to Unciv, so don't bother. = Stavljanje Znanosti u Red Čekanja\nU Civilizaciji V, prinos Znanosti se izračunava nakon proizvodnje, tako da ako završite stavku i imate Znanost (ili Zlato) u redu čekanja kao trajnu izgradnju, Proizvodni preljev iz stavke bit će pretvoren u Znanost (ili Zlato), ali Proizvodnja se ne troši, jer će se to ponoviti samo na sljedećem potezu. Ako odmah zamijenite svoju trajnu izgradnju za stavku na sljedećem potezu, dobit ćete ovu Znanost (ili Zlato) besplatno. Ovo se ne odnosi na Unciv, pa se ne mučite.
+Science Queueing\nIn Civilization V, Science yield is calculated after production, so if you finish an item and have Science (or Gold) queued as a perpetual construction, the Production overflow from item will be converted into Science (or Gold), but the Production is not consumed, as this will only happen again on the next turn. By immediately swapping out your perpetual construction for an item on the next turn, you'll get this Science (or Gold) for free. This doesn't apply to Unciv, so don't bother. = Stavljanje Znanosti u Red Čekanja\nU Civilizaciji V, prinos Znanosti se izračunava nakon proizvodnje, tako da ako završite stavku i imate Znanost (ili Zlato) u redu čekanja kao trajnu izgradnju, preljev Proizvodnje iz stavke bit će pretvoren u Znanost (ili Zlato), ali Proizvodnja se ne konzumira, jer će se to ponoviti tek na sljedećem potezu. Ako odmah zamijenite svoju trajnu izgradnju za stavku na sljedećem potezu, dobit ćete ovu Znanost (ili Zlato) besplatno. Ovo se ne odnosi na Unciv, pa se ne mučite.
 Double Aqueducts\nIn Civilization V, the game sells existing copies of the building for you before providing a free copy of the building. So, if you build an aqueduct in a city, and then in the turn of adopting Tradition Complete you sell a cheap building (e.g a shrine) beforehand, the game is unable to sell more than 1 building per turn, and thus you'll keep your aqueduct, together with the new free aqueduct. Not applicable to Unciv. = Dvostruki akvadukti\nU Civilizaciji V, igra prodaje postojeće kopije zgrade za vas prije nego što pruži besplatnu kopiju zgrade. Dakle, ako izgradite akvadukt u gradu, a zatim u potezu usvajanja Tradicija je Završena prethodno prodate jeftinu zgradu (npr. svetište), igra ne može prodati više od 1 zgrade po potezu, pa ćete tako zadržati svoj akvadukt, zajedno s novim besplatnim akvaduktom. Nije primjenjivo na Unciv.
 Legalism Oxford\nIn Civilization V, national wonders such as Oxford University are considered culture buildings, so you can get them for free with Legalism. Not applicable to Unciv. = Legalizam Oxford\nU Civilizaciji V, nacionalna čuda kao što je Sveučilište Oxford smatraju se zgradama kulture, tako da ih možete dobiti besplatno uz Legalizam. Nije primjenjivo na Unciv.
 Roads and Forts\nIn Civilization V, you can't use roads and forts in enemy territory. In Unciv, you can use them, so instead of mindlessly constructing them everywhere when at war, you need to decide if and when they'll benefit you more than your opponents. = Ceste i utvrde\nU Civilizaciji V, ne možete koristiti ceste i utvrde na neprijateljskom teritoriju. U Unciv-u ih možete koristiti, pa umjesto da ih bezumno konstruirate posvuda dok ste u ratu, trebate odlučiti hoće li i kada više koristiti vama nego vašim protivnicima
@ -7205,4 +7205,3 @@ Forest and Jungle Visibility\nIn Unciv, forests and jungles are visible 1 tile o

 Founding Cities\nThe Settler is a unit that can found a new city. You can build a Settler unit in a city with at least 2 population, and then move them to a good location to found a new city. This will usually be your main way of acquiring more cities. = Osnivanje gradova\nNaseljenik je jedinica koja može osnovati novi grad. Možete izgraditi jedinicu Naseljenika u gradu s najmanje 2 stanovnika, a zatim ih premjestiti na dobru lokaciju kako biste osnovali novi grad. To će obično biti vaš glavni način stjecanja više gradova.
 Food conversion to Production\nDuring the construction of a Settler, the city will not grow. Instead, the 1st, 2nd, 4th, and from there on every 4th, excess Food (Growth) is converted into Production, with the rest of the excess Food being lost. = Pretvorba hrane u proizvodnju\nTijekom izgradnje Naseljenika, grad neće rasti. Umjesto toga, 1., 2., 4., a odatle svaki 4., višak Hrane (Rast) pretvara se u Proizvodnju, a ostatak viška Hrane se gubi.
-
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@ -97,9 +97,9 @@ Requires [buildingName] to be built in the city = Nécessite [buildingName] dans
 Requires [buildingName] to be built in all cities = Nécessite [buildingName] dans toutes les villes
 Provides a free [buildingName] in the city = Fournit un(e) [buildingName] gratuit(e) dans la ville
 # Requires translation!
-Requires improved [resource] near city = 
+Requires improved [resource] near city = Nécessite l'aménagement de [resource] près de la ville
 # Requires translation!
-Requires at least one of the following resources improved near the city: = 
+Requires at least one of the following resources improved near the city: = Nécessite qu'au moins une des ressources suivantes soit aménagée près de la ville :
 Wonder is being built elsewhere = Merveille déjà en construction ailleurs
 National Wonder is being built elsewhere = Merveille Nationale déjà en construction ailleurs
 Requires a [buildingName] in all [cityFilter] cities = Nécessite [buildingName] dans toutes les villes [cityFilter]
@ -378,7 +378,7 @@ Map Options = Options de carte
 Game Options = Options de partie
 Civilizations = Civilisations
 # Requires translation!
-Shuffle Civ Order at Start = 
+Shuffle Civ Order at Start = Mélanger l'ordre des civ. au démarrage
 Map Type = Type de carte
 Map file = Fichier de carte
 Max Turns = Tours max
@ -818,7 +818,7 @@ Visible = Visible
 Permanent = Permanent

 # Requires translation!
-Show minimap = 
+Show minimap = Afficher la mini-carte

 Show tutorials = Afficher les tutoriels
 Reset tutorials = Réinitialiser les tutoriels
@ -855,7 +855,7 @@ Check for idle units = Vérifier les unités inactives
 'Next unit' button cycles idle units = Le bouton 'Unité suivante' parcourt en boucle les unités inactives
 Auto Unit Cycle = Passer automatiquement à l'unité suivante
 # Requires translation!
-Show Small Skip/Cycle Unit Button = 
+Show Small Skip/Cycle Unit Button = Afficher le bouton Passer/Parcourir les unités
 Move units with a single tap = Déplacer les unités avec un seul clic
 Move units with a long tap = Déplacer les unités avec un clic long (écran tactile)
 Auto-assign city production = Production automatique des villes
@ -1657,7 +1657,7 @@ Buildings that consume this resource = Bâtiments consommant cette ressource
 Buildings that provide this resource = Bâtiments fournissant cette ressource
 Improvements that provide this resource = Aménagements fournissant cette ressource
 # Requires translation!
-Buildings that require this resource improved near the city = 
+Buildings that require this resource improved near the city = Bâtiments nécessitant que cette ressource soit aménagée près de la ville
 Units that consume this resource = Unités consommant cette ressource
 Can be built on = Peut être construit sur
 Cannot be built on = Ne peut pas être construit sur
@ -6918,13 +6918,13 @@ Units are defenseless while embarked (cannot use modifiers), and have a fixed De

 Idle Units = Unités inactives
 # Requires translation!
-Clicking 'Next unit' moves to the next idle unit in the queue (as listed in Overview -> Units). After issuing an order to an unit, if 'Auto Unit Cycle' in Options -> Gameplay is enabled, you will automatically select the next idle unit. = 
+Clicking 'Next unit' moves to the next idle unit in the queue (as listed in Overview -> Units). After issuing an order to an unit, if 'Auto Unit Cycle' in Options -> Gameplay is enabled, you will automatically select the next idle unit. = Cliquer sur 'Unité suivante' sélectionne l'unité suivante inactive dans la liste de vos unités (consultable dans Vue d'ensemble > Unités). Après avoir donné un ordre à une unité, si l'option 'Passer automatiquement à l'unité suivante' est activée dans Options > Gameplay, l'unité inactive suivante sera automatiquement sélectionnée.
 If you don't want to move a unit this turn, you can skip it by clicking 'Next unit' again, or command the unit to 'Skip turn'. = Si vous ne voulez pas déplacer une unité lors d'un tour, vous pouvez la passer en cliquant de nouveau sur 'Unité suivante', ou sur l'ordre 'Passer le tour'.
 # Requires translation!
-If you want to disable the 'Next unit' feature entirely, you can toggle it in Options -> Gameplay -> Check for idle units. = 
+If you want to disable the 'Next unit' feature entirely, you can toggle it in Options -> Gameplay -> Check for idle units. = Vous pouvez désactiver le bouton 'Unité suivante' en décochant l'option 'Vérifier les unités inactives' dans Options > Gameplay.
 If you'd rather 'Next unit' cycle the units and not mark them as Done, you can change it in the Options -> Gameplay menu. = Si vous préférez que le bouton 'Unité suivante' parcourt en boucle les unités sans jamais passer leur tour, activez l'option correspondante dans Options > Gameplay.
 # Requires translation!
-You can also cycle through the idle units using the left and right triangles on the Unit Table in the lower left of the screen. Or by default using the Cycle button next to the 'Next Unit' button. = 
+You can also cycle through the idle units using the left and right triangles on the Unit Table in the lower left of the screen. Or by default using the Cycle button next to the 'Next Unit' button. = Il est également possible de parcourir en boucle les unités inactives en utilisant les flèches gauche/droite de la fenêtre Unités située en bas à gauche de l'écran, ou en cliquant sur le bouton Parcourir (activable dans Options > Gameplay) situé à gauche du bouton 'Unité suivante'.

 Contact Me = Me contacter
 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. = Salut ! Si vous avez joué jusqu'ici, vous avez probablement\nremarqué que ce jeu est encore incomplet.\nUnciv est open-source et gratuit, pour toujours.\nCe qui veut dire qu'il ne contient ni pub ni aucun élément payant.
@ -6999,8 +6999,8 @@ This is where you spend most of your time playing Unciv. See the world, control
 ⑬: This pane appears when you order a unit to attack an enemy. On top are attacker and defender with their respective base strengths. = ⑬: Ce panneau apparaît lorsque vous donnez l'ordre à une unité d'attaquer un ennemi. En haut, l'attaquant et le défenseur avec leurs puissances de base respectives.
 ⑭: Below that are strength bonuses or penalties and health bars projecting before / after the attack. = ⑭: En bas, les bonus ou pénalités de puissance, la projection des barres de santé avant / après l'attaque.
 ⑮: The Attack Button - let blood flow! = ⑮: Bouton Attaque - que le sang soit versé !
-⑯: The minimap shows an overview over the world, with known cities, terrain and fog of war. Clicking will position the main map. = ⑯: La minicarte affiche la totalité du monde, avec les villes connues, les terrains et le brouillard de guerre. Cliquer modifiera la position de la carte principale.
-⑰: To the side of the minimap are display feature toggling buttons - tile yield, worked indicator, show/hide resources. These mirror setting on the options screen and are hidden if you deactivate the minimap. = ⑰: Sur le côté de la minicarte se trouvent les boutons de basculement d'affichage pour le rendement des cases, l'indicateur d'exploitation, montrer/cacher les ressources. Ces boutons correspondent aux réglages d'affichage dans les options et sont cachés si vous désactivez la minicarte.
+⑯: The minimap shows an overview over the world, with known cities, terrain and fog of war. Clicking will position the main map. = ⑯: La mini-carte affiche la totalité du monde, avec les villes connues, les terrains et le brouillard de guerre. Cliquer modifiera la position de la carte principale.
+⑰: To the side of the minimap are display feature toggling buttons - tile yield, worked indicator, show/hide resources. These mirror setting on the options screen and are hidden if you deactivate the minimap. = ⑰: Sur le côté de la mini-carte se trouvent les boutons de basculement d'affichage pour le rendement des cases, l'indicateur d'exploitation, montrer/cacher les ressources. Ces boutons correspondent aux réglages d'affichage dans les options et sont cachés si vous désactivez la mini-carte.
 ⑱: Tile information for the selected hex - current or potential yield, terrain, effects, present units, city located there and such. Where appropriate, clicking a line opens the corresponding civilopedia entry. = ⑱: Information de case pour l'hexagone sélectionné - rendement actuel ou potentiel, terrain, effets, unités présentes, villes fondées ici, etc. Si possible, cliquer sur une ligne ouvre la page correspondante dans la civilopédia.
 ⑲: Notifications - what happened during the last 'next turn' phase. Some are clickable to show a relevant place on the map, some even show several when you click repeatedly. = ⑲: Notifications - ce qui s'est passé durant la dernière phase 'tour suivant'. Certaines sont cliquables pour afficher l'emplacement correspondant sur la carte, quelques-unes en affichant même plusieurs à la suite en cliquant de manière répétée.
 ⑳: The Next Turn Button - unless there are things to do, in which case the label changes to 'next unit', 'pick policy' and so on. = ⑳: Bouton Tour Suivant - s'il reste des actions à effectuer, le label change pour 'Unité suivante', 'Choisir une doctrine', etc.
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@ -97,9 +97,9 @@ Requires [buildingName] to be built in the city = Memerlukan [buildingName] untu
 Requires [buildingName] to be built in all cities = Memerlukan [buildingName] untuk dibangun di semua kota
 Provides a free [buildingName] in the city = Menyediakan [buildingName] gratis di kota
 # Requires translation!
-Requires improved [resource] near city = 
+Requires improved [resource] near city = Memerlukan [resource] yang ditingkatkan di dekat kota
 # Requires translation!
-Requires at least one of the following resources improved near the city: = 
+Requires at least one of the following resources improved near the city: = Memerlukan setidaknya salah satu dari sumber daya berikut yang ditingkatkan di dekat kota:
 Wonder is being built elsewhere = Keajaiban Dunia ini sedang dibangun di tempat lain
 National Wonder is being built elsewhere = Keajaiban Nasional ini sedang dibangun di tempat lain
 Requires a [buildingName] in all [cityFilter] cities = Memerlukan [buildingName] di semua kota [cityFilter]
@ -378,7 +378,7 @@ Map Options = Opsi Peta
 Game Options = Opsi Permainan
 Civilizations = Peradaban
 # Requires translation!
-Shuffle Civ Order at Start = 
+Shuffle Civ Order at Start = Acak Urutan Peradaban di Awal
 Map Type = Jenis Peta
 Map file = Berkas peta
 Max Turns = Giliran Maks
@ -818,7 +818,7 @@ Visible = Terlihat
 Permanent = Permanen

 # Requires translation!
-Show minimap = 
+Show minimap = Tunjukkan peta kecil

 Show tutorials = Tunjukkan tutorial
 Reset tutorials = Atur ulang tutorial
@ -855,7 +855,7 @@ Check for idle units = Cek unit yang menganggur
 'Next unit' button cycles idle units = Tombol 'Unit selanjutnya' memutari unit yang menganggur
 Auto Unit Cycle = Siklus Unit Otomatis
 # Requires translation!
-Show Small Skip/Cycle Unit Button = 
+Show Small Skip/Cycle Unit Button = Tunjukkan Tombol Lewati/Siklus Unit
 Move units with a single tap = Gerakkan unit dengan sekali ketuk
 Move units with a long tap = Gerakkan unit dengan ketukan yang lama
 Auto-assign city production = Otomatis tugaskan produksi kota
@ -1657,7 +1657,7 @@ Buildings that consume this resource = Bangunan yang menggunakan sumber daya ini
 Buildings that provide this resource = Bangunan yang menyediakan sumber daya ini
 Improvements that provide this resource = Peningkatan yang menyediakan sumber daya ini
 # Requires translation!
-Buildings that require this resource improved near the city = 
+Buildings that require this resource improved near the city = Bangunan yang memerlukan sumber daya ini ditingkatkan di dekat kota
 Units that consume this resource = Unit yang menggunakan sumber daya ini
 Can be built on = Dapat dibangun di
 Cannot be built on = Tidak dapat dibangun di
@ -5218,7 +5218,7 @@ Formation I = Formasi I

 Formation II = Formasi II

-Blitz = Blitz
+Blitz = Serangan Kilat

 Woodsman = Ahli Hutan

@ -6918,13 +6918,13 @@ Units are defenseless while embarked (cannot use modifiers), and have a fixed De

 Idle Units = Unit Menganggur
 # Requires translation!
-Clicking 'Next unit' moves to the next idle unit in the queue (as listed in Overview -> Units). After issuing an order to an unit, if 'Auto Unit Cycle' in Options -> Gameplay is enabled, you will automatically select the next idle unit. = 
+Clicking 'Next unit' moves to the next idle unit in the queue (as listed in Overview -> Units). After issuing an order to an unit, if 'Auto Unit Cycle' in Options -> Gameplay is enabled, you will automatically select the next idle unit. = Mengeklik 'Unit selanjutnya' menggerakkannya ke unit yang menganggur selanjutnya dalam antrean (seperti yang didaftarkan di Gambaran Umum -> Unit). Setelah memberikan perintah kepada unit, jika 'Siklus Unit Otomatis' di Opsi -> Permainan dinyalakan, kamu akan secara otomatis memilih unit yang menganggur selanjutnya.
 If you don't want to move a unit this turn, you can skip it by clicking 'Next unit' again, or command the unit to 'Skip turn'. = Jika kamu tidak ingin menggerakkan unit pada giliran ini, kamu dapat melewatinya dengan mengeklik 'Unit selanjutnya' lagi, atau memerintahkan unit untuk 'Lewati giliran'.
 # Requires translation!
-If you want to disable the 'Next unit' feature entirely, you can toggle it in Options -> Gameplay -> Check for idle units. = 
+If you want to disable the 'Next unit' feature entirely, you can toggle it in Options -> Gameplay -> Check for idle units. = Jika kamu ingin mematikan fitur 'Unit selanjutnya' sepenuhnya, kamu dapat mengalihkannya di Opsi -> Permainan -> Cek unit menganggur.
 If you'd rather 'Next unit' cycle the units and not mark them as Done, you can change it in the Options -> Gameplay menu. = Jika kamu lebih baik 'Unit selanjutnya' lewati unit dan tidak menandai mereka sebagai Selesai, kamu dapat mengubahnya di Opsi -> Menu permainan.
 # Requires translation!
-You can also cycle through the idle units using the left and right triangles on the Unit Table in the lower left of the screen. Or by default using the Cycle button next to the 'Next Unit' button. = 
+You can also cycle through the idle units using the left and right triangles on the Unit Table in the lower left of the screen. Or by default using the Cycle button next to the 'Next Unit' button. = Kamu juga dapat melewati unit yang menganggur dengan menggunakan segitiga kiri dan kanan pada Tabel Unit di kiri bawah layar. Atau secara bawaan menggunakan tombol Siklus di samping tombol 'Unit Selanjutnya'.

 Contact Me = Kontak Saya
 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. = Halo! Jika kamu telah bermain sejauh ini, kamu mungkin menyadari bahwa permainan ini belum lengkap.\n Unciv dibuat dengan sumber yang terbuka dan gratis, selamanya.\n Itu berarti tidak ada iklan dan omong kosong lainnya.
--- a/android/assets/jsons/translations/Italian.properties
+++ b/android/assets/jsons/translations/Italian.properties
@ -102,10 +102,8 @@ New [civName]\n(formerly known as [cityName]) = Nuova [civName]\n(ex [cityName])
 Requires [buildingName] to be built in the city = La Città richiede [buildingName]
 Requires [buildingName] to be built in all cities = Richiede [buildingName] in tutte le città
 Provides a free [buildingName] in the city = Dona l'edificio gratuito [buildingName] nella città
- # Requires translation!
-Requires improved [resource] near city = 
- # Requires translation!
-Requires at least one of the following resources improved near the city: = 
+Requires improved [resource] near city = Richiede la risorsa [resource] nei pressi della città
+Requires at least one of the following resources improved near the city: = Richiede almeno una delle seguenti risorse migliorate nei pressi della città:
 Wonder is being built elsewhere = Meraviglia in costruzione altrove
 National Wonder is being built elsewhere = Una Meraviglia Nazionale è in costruzione altrove
 Requires a [buildingName] in all [cityFilter] cities = Richiede [buildingName] in tutte le città [cityFilter]
@ -383,8 +381,7 @@ Start game! = Comincia la tua avventura!
 Map Options = Opzioni mappa
 Game Options = Opzioni di gioco
 Civilizations = Civiltà
- # Requires translation!
-Shuffle Civ Order at Start = 
+Shuffle Civ Order at Start = Mischia ordine Civiltà all'inizio
 Map Type = Tipo di mappa
 Map file = File mappa
 Max Turns = Limite turni
@ -823,8 +820,7 @@ Hidden = Nascoste
 Visible = Visibili
 Permanent = Permanente

- # Requires translation!
-Show minimap = 
+Show minimap = Mostra minimappa

 Show tutorials = Mostra tutorial
 Reset tutorials = Reset tutorial
@ -860,8 +856,7 @@ Gameplay = Gameplay
 Check for idle units = Controlla unità inutilizzate
 'Next unit' button cycles idle units = Il tasto 'Prossima unità' cicla tra unità inutilizzate
 Auto Unit Cycle = Auto-cicla unità
- # Requires translation!
-Show Small Skip/Cycle Unit Button = 
+Show Small Skip/Cycle Unit Button = Mostra minitasto Salta/Cicla unità
 Move units with a single tap = Sposta unità con un solo tocco
 Move units with a long tap = Sposta unita tenendo premuto
 Auto-assign city production = Autoassegna produzione città
@ -1662,8 +1657,7 @@ Bonus stats for improvement = Bonus per miglioramento
 Buildings that consume this resource = Edifici che consumano questa risorsa
 Buildings that provide this resource = Edifici che producono questa risorsa
 Improvements that provide this resource = Miglioramenti che producono questa risorsa
- # Requires translation!
-Buildings that require this resource improved near the city = 
+Buildings that require this resource improved near the city = Edifici che richiedono la risorsa migliorata nei pressi della città
 Units that consume this resource = Unità che consumano questa risorsa
 Can be built on = Può essere costruito/a su
 Cannot be built on = Non costruibile su
@ -6923,14 +6917,11 @@ Once a certain tech is researched, your land units can embark, allowing them to
 Units are defenseless while embarked (cannot use modifiers), and have a fixed Defending Strength based on your tech Era, so be careful!\nRanged Units can't attack, Melee Units have a Strength penalty, and all have limited vision. = Stai attento: le unità imbarcate sono indifese (non avendo modificatori), e possiedono un raggio visione limitato e una Forza difensiva fissa in base alla tua era tecnologica.\nInoltre, le unità da tiro non possono attaccare, mentre quelle da mischia possiedono una penalità in Forza.

 Idle Units = Unità non usate
- # Requires translation!
-Clicking 'Next unit' moves to the next idle unit in the queue (as listed in Overview -> Units). After issuing an order to an unit, if 'Auto Unit Cycle' in Options -> Gameplay is enabled, you will automatically select the next idle unit. = 
+Clicking 'Next unit' moves to the next idle unit in the queue (as listed in Overview -> Units). After issuing an order to an unit, if 'Auto Unit Cycle' in Options -> Gameplay is enabled, you will automatically select the next idle unit. = Se clicchi su 'Prossima unità', andrai all'unità non mossa successiva nella coda (vista in Panoramica -> Unità). Dopo aver impartito un ordine, se hai attivato 'Autocicla unità' su Opzioni -> Gameplay, selezionerai automaticamente l'unità non mossa successiva.
 If you don't want to move a unit this turn, you can skip it by clicking 'Next unit' again, or command the unit to 'Skip turn'. = Se non desideri spostare un'unità per questo turni, puoi saltarla cliccando di nuovo su 'Prossima unità' od ordinandole 'Salta'.
- # Requires translation!
-If you want to disable the 'Next unit' feature entirely, you can toggle it in Options -> Gameplay -> Check for idle units. = 
+If you want to disable the 'Next unit' feature entirely, you can toggle it in Options -> Gameplay -> Check for idle units. = Se vuoi disabilitare interamente la caratteristica 'Prossima unità', puoi farlo su Opzioni -> Gameplay -> Controlla unità non mosse.
 If you'd rather 'Next unit' cycle the units and not mark them as Done, you can change it in the Options -> Gameplay menu. = Se preferisci cliclare le unità tramite 'Prossima unità' anziché segnarle come mosse, puoi cambiare ciò su Opzioni -> Menu gameplay.
- # Requires translation!
-You can also cycle through the idle units using the left and right triangles on the Unit Table in the lower left of the screen. Or by default using the Cycle button next to the 'Next Unit' button. = 
+You can also cycle through the idle units using the left and right triangles on the Unit Table in the lower left of the screen. Or by default using the Cycle button next to the 'Next Unit' button. = Puoi anche scorrere tra le unità non mosse usando i tasti triangolari a destra e sinistra sulla tabella unità in basso a sinistra dello schermo, o per default usare il tasto cicla vicino a quello di 'Prossima unità'.

 Contact Me = Contattami
 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. = Salve! Se sei giunto/a fin qui, forse avrai visto che il gioco è al momento incompleto.\nUnciv dovrebbe essere open-source e gratuito per sempre, quindi privo di pubblicità o altre siocchezze.
--- a/android/assets/jsons/translations/Polish.properties
+++ b/android/assets/jsons/translations/Polish.properties
@ -102,9 +102,9 @@ Requires [buildingName] to be built in the city = Miasto musi posiadać → [bui
 Requires [buildingName] to be built in all cities = Wszystkie miasta muszą posiadać: [buildingName]
 Provides a free [buildingName] in the city = Zapewnia darmowy budynek: [buildingName] w tym mieście
 # Requires translation!
-Requires improved [resource] near city = 
+Requires improved [resource] near city = Wymaga ulepszonego surowca [resource] w pobliżu miasta
 # Requires translation!
-Requires at least one of the following resources improved near the city: = 
+Requires at least one of the following resources improved near the city: = Wymaga przynajmniej jednego ulepszonego surowca (w pobliżu miasta) z przedstawionych poniżej:
 Wonder is being built elsewhere = Ten Cud jest już budowany w innym mieście
 National Wonder is being built elsewhere = Ten Cud Narodowy jest już budowany w innym mieście
 Requires a [buildingName] in all [cityFilter] cities = Wymaga [buildingName] we wszystkich [cityFilter] miastach
@ -383,7 +383,7 @@ Map Options = Opcje mapy
 Game Options = Opcje gry
 Civilizations = Cywilizacje
 # Requires translation!
-Shuffle Civ Order at Start = 
+Shuffle Civ Order at Start = Losuj kolejność gry cywilizacji
 Map Type = Mapa
 Map file = Gotowe mapy
 Max Turns = Maksymalna liczba tur
@ -396,7 +396,7 @@ Custom = Wybierz...
 Map Generation Type = Rozmieszczenie lądów
 Enabled Map Generation Types = Włączono generowanie rozmieszczania lądów
 # Requires translation!
-Example map = 
+Example map = Mapa przykładowa

 # Map types
 Default = Domyślny
@ -409,9 +409,9 @@ Archipelago = Archipelag
 Inner Sea = Morze wewnętrzne
 Perlin = Perlin
 # Requires translation!
-Small Continents = 
+Small Continents = Małe kontynenty
 # Requires translation!
-Fractal = 
+Fractal = Chaos

 Select players from starting locations = Wybierz graczy z pól startowych
 Random number of Civilizations = Losowa liczba cywilizacji
@ -826,7 +826,7 @@ Visible = Widoczne
 Permanent = Na stałe

 # Requires translation!
-Show minimap = 
+Show minimap = Pokaż minimapę

 Show tutorials = Pokaż samouczki
 Reset tutorials = Zresetuj samouczki
@ -1003,12 +1003,12 @@ Your citizens are revolting due to very high unhappiness! = Twoi obywatele buntu

  
 # Requires translation!
-An enemy [unit] has attacked [cityName] ([amount2] HP) = 
+An enemy [unit] has attacked [cityName] ([amount2] HP) = Wroga jednostka [unit] zaatakowała [cityName] ([amount2] PŻ)
 An enemy [unit] ([amount] HP) has attacked [cityName] ([amount2] HP) = Wroga jednostka [unit] ([amount] PŻ) zaatakowała [cityName] ([amount2] PŻ)
 An enemy [unit] ([amount] HP) has [battleAction] our [ourUnit] ([amount2] HP) = Wroga jednostka [unit] ([amount] PŻ) [battleAction] naszą jednostkę [ourUnit] ([amount2] PŻ)
 An enemy [unit] has attacked our [ourUnit] ([amount] HP) = Wroga jednostka [unit] zaatakowała naszą jednostkę [ourUnit] ([amount] PŻ)
 # Requires translation!
-An enemy [unit] ([amount] HP) has attacked our [ourUnit] ([amount2] HP) = 
+An enemy [unit] ([amount] HP) has attacked our [ourUnit] ([amount2] HP) = Wroga jednostka [unit] ([amount] PŻ) zaatakowała naszą jednostkę [ourUnit] ([amount2] PŻ)
 Enemy city [cityName] has attacked our [ourUnit] = Wrogie miasto [cityName] ostrzelało naszą jednostkę [ourUnit]
 Enemy city [cityName] has attacked our [ourUnit] ([amount2] HP) = Miasto wroga [cityName] zaatakowało naszą jednostkę [ourUnit] ([amount2] PŻ) 
 An enemy [unit] has captured [cityName] = Wroga jednostka [unit] zdobyła nasze miasto [cityName]
@ -1192,11 +1192,11 @@ turn = tura
 Next unit = Następna jednostka
 [amount] units idle = [amount] bezczynnych jednostek
 # Requires translation!
-[idleCount] idle = 
+[idleCount] idle = [idleCount] bezczynnych
 # Requires translation!
 [skipCount] skipping = 
 # Requires translation!
-Cycle = 
+Cycle = Cykl
 Fog of War = Mgła wojny
 Pick a policy = Wybierz ustrój
 Move Spies = Przemieść Szpiegów
@ -1247,7 +1247,7 @@ Pillage [improvement] = Splądruj [improvement]
 [improvement] (Pillaged!) = [improvement] (Splądrowane!)
 Repair [improvement] - [turns] = Naprawa [improvement] - [turns]
 # Requires translation!
-Skip turn = 
+Skip turn = Pomiń turę
 Are you sure you want to pillage this [improvement]? = Czy na pewno chcesz splądrować [improvement]?
 We have looted [amount] from a [improvement] = Zrabowaliśmy [amount] z [improvement]
 We have looted [amount] from a [improvement] which has been sent to [cityName] = Zrabowaliśmy [amount] z [improvement] które były wysłane do [cityName]
@ -1671,7 +1671,7 @@ Buildings that consume this resource = Budynki zużywające ten surowiec
 Buildings that provide this resource = Budynki zapewniające ten surowiec
 Improvements that provide this resource = Ulepszenia zapewniąjące ten surowiec
 # Requires translation!
-Buildings that require this resource improved near the city = 
+Buildings that require this resource improved near the city = Budynki, które wymagają tego surowca ulepszonego w pobliżu miasta, w którym są zbudowane
 Units that consume this resource = Jednostki zużywające ten surowiec
 Can be built on = Do budowy nadają się obszary
 Cannot be built on = Do budowy nie nadają się obszary
@ -2228,7 +2228,7 @@ Automatically built in all cities where it is buildable = Automatycznie budowane
 Creates a [improvementName] improvement on a specific tile = Tworzy ulepszenia [improvementName] na określonych polach
 Founds a new city = Może zakładać nowe miasta
 # Requires translation!
-Founds a new puppet city = 
+Founds a new puppet city = Zakłada nowe miasto marionetkowe
 Can instantly construct a [improvementFilter] improvement = Może natychmiastowo wybudować [improvementFilter]
 May create improvements on water resources = Może budować ulepszenia na wodzie
 Can build [improvementFilter/terrainFilter] improvements on tiles = Może budować ulepszenia [improvementFilter/terrainFilter]
@ -2405,7 +2405,7 @@ when at war = podczas wojny
 when not at war = w czasie trwania pokoju
 during a Golden Age = podczas Złotej Ery
 # Requires translation!
-when not in a Golden Age = 
+when not in a Golden Age = gdy jest się w Złotej Erze
 during We Love The King Day = podczas Dnia Uwielbienia Króla
 while the empire is happy = jeśli Obywatele są ⌣Zadowoleni
 when between [amount] and [amount2] Happiness = kiedy Zadowolenie wynosi [amount] do [amount2]
@ -2550,7 +2550,7 @@ upon constructing [buildingFilter] [cityFilter] = po wybudowaniu [buildingFilter
 upon gaining a [baseUnitFilter] unit = po zdobyciu jednostki [baseUnitFilter]
 upon turn end = po zakończeniu tury
 # Requires translation!
-upon turn start = 
+upon turn start = po rozpoczęciu tury
 upon founding a Pantheon = po założeniu Panteonu
 upon founding a Religion = po założeniu Religii
 upon enhancing a Religion = po rozszerzeniu Religii
@ -2567,7 +2567,7 @@ upon losing at least [amount] HP in a single attack = po straceniu przynajmniej
 upon ending a turn in a [tileFilter] tile = po zakończeniu tury na polu [tileFilter]
 upon discovering a [tileFilter] tile = po odkryciu pola [tileFilter]
 # Requires translation!
-upon entering a [tileFilter] tile = 
+upon entering a [tileFilter] tile = po wkroczeniu na pole [tileFilter]
 for [amount] turns = przez [amount] ⏳tur
 hidden from users = Ukryte przed graczami
 for every [countable] = za każdy [countable]
--- a/android/assets/jsons/translations/Simplified_Chinese.properties
+++ b/android/assets/jsons/translations/Simplified_Chinese.properties
@ -28,7 +28,7 @@ Fastlane_short_description = 4X文明建设类游戏

 # Documentation: https://f-droid.org/en/docs/Build_Metadata_Reference/#Description
 # English to translate: https://github.com/yairm210/Unciv/blob/master/fastlane/metadata/android/en-US/full_description.txt
-Fastlane_full_description = 重新实现有史以来最著名的文明建设类游戏-快，小，无广告，永远免费！\n\n建设文明，发展科技，扩展城市，征战四方！\n\n请求？漏洞？待办事项列表位于https://github.com/yairm210/Unciv/issues，欢迎每一个小小的帮助！\n\n问题？评论？只是无聊？在https://discord.gg/bjrB4Xw上加入我们！\n\n想帮忙把游戏翻译成你的语言吗？给我发送电子邮件到yairm210@hotmail.com。\n\n熟悉Java或Kotlin？在https://github.com/yairm210/Unciv加入我们。\n\n看不懂英文但仍然希望为社区做贡献？加入中文社区QQ群675179266或点击网址http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=UHIJomTUkhevKOkwu5vQtyDMHO6oqqB2&authKey=vLV%2FVDcmUU7uPA2ggTe8F6x%2FM4ySgZxQ50VjNLCYQL%2BI8lAgFUOVA90nHcVCZ78s&noverify=0&group_code=675179266\n\n世界正在等待！你能建立一个经得起时间考验的文明吗？\n\n用户发起的下载和多人游戏功能需要“完全网络访问”权限。用于实现多人游戏回合通知的API会自动包含所有其他列出的权限。网络权限用于列出模组、下载模组、下载音乐以及上传/下载多人游戏。Unciv不会发起其他互联网通信。
+Fastlane_full_description = 重新打造经典：史上最具影响力的文明建设游戏——快速、轻量、无广告，永远免费！在游戏中，你可以建设属于自己的文明，发展科技，扩张城市，征服四方。遇到问题、发现漏洞，或者想参与开发，可以访问我们的待办事项列表 GitHub Issues（https://github.com/yairm210/Unciv/issues），我们欢迎每一位小伙伴的参与。想讨论游戏、有疑问，或者只是想找地方消遣？加入我们的 Discord 社区（https://discord.gg/bjrB4Xw）。如果你熟悉 Java 或 Kotlin，欢迎来 GitHub 项目（https://github.com/yairm210/Unciv） 找我们，一起让游戏变得更好。不懂英文但想为社区做贡献？可以加入我们的中文社区 QQ 群：675179266，或者点击 http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=UHIJomTUkhevKOkwu5vQtyDMHO6oqqB2&authKey=vLV%2FVDcmUU7uPA2ggTe8F6x%2FM4ySgZxQ50VjNLCYQL%2BI8lAgFUOVA90nHcVCZ78s&noverify=0&group_code=675179266。世界正等待你的创造，你能建立一个经得起时间考验的文明吗？用户发起的下载和多人游戏功能需要“完全网络访问”权限，用于实现多人游戏回合通知的 API 会自动包含所有其他列出的权限，网络权限仅用于列出模组、下载模组、下载音乐以及上传/下载多人游戏，Unciv 不会发起其他互联网通信。


 # Starting from here normal translations start, as described in
@ -38,7 +38,7 @@ Fastlane_full_description = 重新实现有史以来最著名的文明建设类
 Delete = 删除

 # Base ruleset names
-Civ V - Vanilla = 文明5 - 无DLC
+Civ V - Vanilla = 文明5 - 本体
 Civ V - Gods & Kings = 文明5 - 众神与国王

 # Obsolete Tutorial tasks - the active lines are moved to 'Lines from Events', much later in the tranlsation file.
@ -53,7 +53,7 @@ Pass a turn!\nCycle through units with 'Next unit' > Click 'Next turn' = 跳过
 Reassign worked tiles!\nEnter city screen > Click the assigned (green) tile to unassign > \n Click an unassigned tile to assign population = 重新调整工作地块！\n进入城市界面 > 点击已分配市民的地块取消分配 > \n 点击未被分配市民的地块分配市民
 Meet another civilization!\nExplore the map until you encounter another civilization! = 认识其他文明!\n探索地图直到你遇见另一个文明!
 Open the options table!\nClick the menu button (top left) > Click 'Options' = 打开设置选项!\n点击菜单按钮(左上角) > 点击 “选项”
-Construct an improvement!\nConstruct a Worker unit > Move to a Plains or Grassland tile > \n Click 'Construct improvement' (above the unit table, bottom left)\n > Choose the farm > \n Leave the worker there until it's finished = 建造地块设施！\n建造一个工人 > 移动工人至平原或草原地块 > \n 点击 “建造设施” 按钮（左下角） > 选择 “农场” > \n 不向工人下达其他指令直至建造完成
+Construct an improvement!\nConstruct a Worker unit > Move to a Plains or Grassland tile > \n Click 'Construct improvement' (above the unit table, bottom left)\n > Choose the farm > \n Leave the worker there until it's finished = 建造地块改良！\n建造一个工人 > 移动工人至平原或草原地块 > \n 点击 “建造改良” 按钮（左下角） > 选择 “农场” > \n 不向工人下达其他指令直至建造完成
 Create a trade route!\nConstruct roads between your capital and another city\nOr, automate your worker and let him get to that eventually = 建立贸易路线！\n建造道路连接你的首都和其他城市\n或将工人设置为 “自动工作”，其将自动完成连接
 Conquer a city!\nBring an enemy city down to low health > \nEnter the city with a melee unit = 占领城市！\n攻击敌方城市使其耐久降为 1 > \n使用近战单位占领城市
 Move an air unit!\nSelect an air unit > Select another city within range > \nMove the unit to the other city = 移动空军单位！\n选择一个空军单位 > 选取移动范围内的其他城市 > \n将单位移至该城市
@ -85,21 +85,19 @@ Hydro Plant = 水电站

 # City naming when list exhausted

-New [cityName] = 第二[cityName]
-Neo [cityName] = 第三[cityName]
-Nova [cityName] = 第四[cityName]
-Altera [cityName] = 第五[cityName]
-New [civName]\n(formerly known as [cityName]) = 第二[civName]\n（一般认作[cityName]）
+New [cityName] = [cityName]-乙
+Neo [cityName] = [cityName]-丙
+Nova [cityName] = [cityName]-丁
+Altera [cityName] = [cityName]-戊
+New [civName]\n(formerly known as [cityName]) = 新[civName]\n（一般认作[cityName]）

 # Diplomacy,Trade,Nations

 Requires [buildingName] to be built in the city = 要求此城建有[buildingName]
 Requires [buildingName] to be built in all cities = 要求所有城市建有[buildingName]
 Provides a free [buildingName] in the city = 此城立刻建造免费的[buildingName]
- # Requires translation!
-Requires improved [resource] near city = 
- # Requires translation!
-Requires at least one of the following resources improved near the city: = 
+Requires improved [resource] near city = 要求此城附近有已改良的[resource]
+Requires at least one of the following resources improved near the city: = 要求此城附近有已改良的至少一个：
 Wonder is being built elsewhere = 其他城市正在建造该奇观
 National Wonder is being built elsewhere = 其他城市正在建造该国家奇观
 Requires a [buildingName] in all [cityFilter] cities = 要求所有[cityFilter]城市建有[buildingName]
@ -254,7 +252,7 @@ Revoke protection for [cityStateName]? = 撤销对[cityStateName]的保护
 Pledge to protect = 承诺保护
 Declare Protection of [cityStateName]? = 要声明保护[cityStateName]吗?
 Build [improvementName] on [resourceName] (200 Gold) = 援建[improvementName]以开采[resourceName]（花费200金）
-Gift Improvement = 援建改良设施
+Gift Improvement = 援建改良
 [civName] is able to provide [unitName] once [techName] [isOrAre] researched. = 研究[techName]后[civName]会赠送名称[isOrAre][unitName]的单位
 is = 是
 are = 是
@ -377,8 +375,7 @@ Start game! = 开始游戏！
 Map Options = 地图设置
 Game Options = 游戏设置
 Civilizations = 文明
- # Requires translation!
-Shuffle Civ Order at Start = 
+Shuffle Civ Order at Start = 随机打乱文明行动顺序
 Map Type = 地图创建方式
 Map file = 地图文件
 Max Turns = 最大回合
@ -390,23 +387,20 @@ Existing = 从文件载入
 Custom = 自定义
 Map Generation Type = 生成地图类型
 Enabled Map Generation Types = 可用的生成地图类型
- # Requires translation!
-Example map = 
+Example map = 地图示例

 # Map types
-Default = 预设
+Default = 默认
 Pangaea = 盘古大陆
 Continent and Islands = 大陆与群岛
-Two Continents = 两个大洲
-Three Continents = 三个大洲
-Four Corners = 四岛
+Two Continents = 两片大陆
+Three Continents = 三片大陆
+Four Corners = 四片大陆
 Archipelago = 群岛
 Inner Sea = 内海
-Perlin = 柏林算法/千湖
- # Requires translation!
-Small Continents = 
- # Requires translation!
-Fractal = 
+Perlin = 柏林噪音
+Small Continents = 多片大陆
+Fractal = 分形体

 Select players from starting locations = 从初始位置挑选玩家
 Random number of Civilizations = 随机文明数量
@ -527,7 +521,7 @@ Base Ruleset = 基本规则集
 [amount] Units = [amount]种单位
 [amount] Buildings = [amount]种建筑
 [amount] Resources = [amount]种资源
-[amount] Improvements = [amount]种改良设施
+[amount] Improvements = [amount]种改良
 [amount] Religions = [amount]个宗教
 [amount] Beliefs = [amount]类信仰

@ -564,7 +558,7 @@ Features = 地形
 Starting locations = 文明起源位置
 Tile Matching Criteria = 地块匹配条件
 Complete match = 完整检查
-Except improvements = 不检查地块设施
+Except improvements = 不检查地块改良
 Base and terrain features = 仅检查地形地貌
 Base terrain only = 仅检查地形
 Land or water only = 仅检查陆地还是水上
@ -624,7 +618,7 @@ Floodfill = 填充刷
 [nation] starting location = [nation]起源位置
 Any Civ = 任一文明
 Remove features = 移除地形
-Remove improvement = 移除地块设施
+Remove improvement = 移除改良
 Remove resource = 移除资源
 Remove starting locations = 移除起始位
 Remove rivers = 移除河流
@ -820,8 +814,7 @@ Hidden = 已隐藏
 Visible = 已显示
 Permanent = 永久

- # Requires translation!
-Show minimap = 
+Show minimap = 显示小地图

 Show tutorials = 显示教程
 Reset tutorials = 重置教程
@ -838,12 +831,12 @@ Size of Unitset art in Civilopedia = 文明百科单位图片大小

 Visual Hints = 视觉提示
 Show worked tiles = 显示工作地块
-Show resources and improvements = 显示资源与设施
+Show resources and improvements = 显示资源与改良
 Show tile yields = 显示地块产出
 Show unit movement arrows = 显示单位移动箭头
 Show suggested city locations for units that can found cities = 为能找到城市的单位显示建议的城市位置
-Show pixel units = 显示像素单位
-Show pixel improvements = 显示像素设施
+Show pixel units = 显示单位像素材质
+Show pixel improvements = 显示改良像素材质
 Unit icon opacity = 单位图标不透明度

 ### Performance subgroup
@ -857,13 +850,12 @@ Gameplay = 游戏内容
 Check for idle units = 回合结束前查看闲置单位
 'Next unit' button cycles idle units = 「下个闲置单位」按钮循环空闲单位
 Auto Unit Cycle = 自动循环单位
- # Requires translation!
-Show Small Skip/Cycle Unit Button = 
+Show Small Skip/Cycle Unit Button = 显示小号的跳过/循环单位按钮
 Move units with a single tap = 点击目标地块立即移动
 Move units with a long tap = 长按以移动单位
 Auto-assign city production = 自动分配城市产能
 Auto-build roads = 自动建造道路/铁路
-Automated workers replace improvements = 工人自动更换设施
+Automated workers replace improvements = 工人自动翻新改良
 Automated units move on turn start = 每回合开始时自动移动单位
 Automated units can upgrade = 单位自动可以升级
 Automated units choose promotions = 单位自动选择升级
@ -997,13 +989,11 @@ We have conquered the city of [cityName]! = 我们已经占领城市[cityName]
 Your citizens are revolting due to very high unhappiness! = 您的公民因极度不满而正在反叛！


- # Requires translation!
-An enemy [unit] has attacked [cityName] ([amount2] HP) = 
+An enemy [unit] has attacked [cityName] ([amount2] HP) = 敌方的[unit]攻击了[cityName]（[amount2] HP）
 An enemy [unit] ([amount] HP) has attacked [cityName] ([amount2] HP) = 敌方的[unit]（[amount] HP）攻击了[cityName]（[amount2] HP）
 An enemy [unit] ([amount] HP) has [battleAction] our [ourUnit] ([amount2] HP) = 敌方的[unit]（[amount] HP）[battleAction]了我们的[ourUnit]（[amount2] HP）
 An enemy [unit] has attacked our [ourUnit] ([amount] HP) = 敌方的[unit]攻击了我们的[ourUnit]（[amount] HP）
- # Requires translation!
-An enemy [unit] ([amount] HP) has attacked our [ourUnit] ([amount2] HP) = 
+An enemy [unit] ([amount] HP) has attacked our [ourUnit] ([amount2] HP) = 敌方的[unit]（[amount] HP）攻击了我们的[ourUnit]（[amount2] HP）
 Enemy city [cityName] has attacked our [ourUnit] = 敌方城市[cityName]攻击了我们的[ourUnit]
 Enemy city [cityName] has attacked our [ourUnit] ([amount2] HP) = 敌方城市[cityName]攻击了我们的[ourUnit]，造成[amount2]点伤害
 An enemy [unit] has captured [cityName] = 敌方的[unit]占领了[cityName]
@ -1040,7 +1030,7 @@ Nothing tried to intercept our [attackerName] = 无人试图拦截我方[attacke

 An enemy [unit] was spotted near our territory = 我们的领土附近发现了敌方的[unit]
 An enemy [unit] was spotted in our territory = 我们的领土内发现了敌方的[unit]
-An enemy [unit] has destroyed our tile improvement [improvement] = 敌方的[unit]摧毁了我们的[improvement]地块设施
+An enemy [unit] has destroyed our tile improvement [improvement] = 敌方的[unit]摧毁了我们的[improvement]改良
 Your city [cityName] can bombard the enemy! = 你的城市[cityName]可以轰击敌人！
 [amount] of your cities can bombard the enemy! = 你有 [amount] 座城市可以轰击敌人！
 [amount] enemy units were spotted near our territory = 我们的领土附近发现了 [amount] 个敌方单位
@ -1187,12 +1177,10 @@ turn = 回合
 Next unit = 下个闲置单位
 [amount] units idle = [amount]个单位闲置
 [idleCount] idle = [idleCount] 闲置
- # Requires translation!
-[skipCount] skipping = 
- # Requires translation!
-Cycle = 
+[skipCount] skipping = 跳过[skipCount]
+Cycle = 周期
 Fog of War = 战争迷雾
-Pick a policy = 选择一项社会政策
+Pick a policy = 推行新政策
 Move Spies = 转移间谍
 Movement = 移动力
 Strength = 战斗力
@ -1202,9 +1190,9 @@ Range = 攻击范围
 XP = 经验值
 Move unit = 移动单位
 Stop movement = 停止移动
-Show unit destination = 显示单元目的地
+Show unit destination = 显示单位移动轨迹
 Swap units = 交换单位
-Construct improvement = 建造设施
+Construct improvement = 修建改良
 Automate = 自动工作
 Stop automation = 停止自动工作
 Construct road = 建造道路
@ -1240,8 +1228,7 @@ Pillage = 劫掠地块
 Pillage [improvement] = 劫掠地块 [improvement]
 [improvement] (Pillaged!) = [improvement]（被劫掠！）
 Repair [improvement] - [turns] = 修理[improvement] - 需要[turns]
- # Requires translation!
-Skip turn = 
+Skip turn = 跳过回合
 Are you sure you want to pillage this [improvement]? = 你确定要劫掠这个[improvement]吗？
 We have looted [amount] from a [improvement] = 我们从[improvement]劫掠了[amount]
 We have looted [amount] from a [improvement] which has been sent to [cityName] = 我们从[improvement]劫掠了[amount]并将其运至[cityName]
@ -1313,7 +1300,7 @@ Purchase = 购买
 No space available to place [unit] near [city] = [city]附近没有位置部署[unit]
 Maintenance cost = 建筑维护费
 Pick construction = 选择建造/训练
-Pick improvement = 选择设施
+Pick improvement = 选择改良
 Tile owned by [civName] - [cityName] = 地块属于 [civName] - [cityName]
 Tile owned by [civName] (You) = 地块属于[civName](你)
 Unowned tile = 无主地块
@ -1324,8 +1311,8 @@ Not in city work range = 不属于市民可工作范围
 Pick now! = 选择此项！
 Remove [feature] first = 需要先移除[feature]才能建造
 Research [tech] first = 需要先研究[tech]
-Have this tile close to your borders = 该地块设施一定要建在领土边界附近！
-Have this tile inside your empire = 该地块设施一定要建在您的领土内！
+Have this tile close to your borders = 该地块改良一定要建在领土边界附近！
+Have this tile inside your empire = 该地块改良一定要建在您的领土内！
 Acquire more [resource] = 需要更多[resource]
 Build [building] = 建造[building]
 Train [unit] = 组建[unit]
@ -1403,7 +1390,7 @@ Wonder = 奇观
 National Wonder = 国家奇观
 National Wonders = 国家奇观
 Wonders enabled = 解锁奇观
-Tile improvements enabled = 解锁地块设施
+Tile improvements enabled = 解锁地块改良
 Reveals [resource] on the map = 在地图上显示[resource]
 XP for new units = 新组建单位的初始经验值
 provide = 提供
@ -1444,8 +1431,8 @@ Stacked with [unitType] = 与[unitType]单位叠放

 Unit ability = 单位能力

-The following improvements [stats]: = 下列设施[stats]：
-The following improvements on [tileType] tiles [stats]: = 建造在[tileType]地块上的下列设施[stats]：
+The following improvements [stats]: = 下列改良[stats]：
+The following improvements on [tileType] tiles [stats]: = 建造在[tileType]地块上的下列改良[stats]：

 # Unit actions

@ -1528,7 +1515,7 @@ You = 你
 Turn [turnNumber] = 回合[turnNumber]
 Location = 位置
 Unimproved = 未开发
-Number of tiles with this resource\nin your territory, without an\nappropriate improvement to use it = 指在您的领地中，但未被使用妥当的地块设施来开发的资源总量。
+Number of tiles with this resource\nin your territory, without an\nappropriate improvement to use it = 指在您的领地中，但未被使用妥当的地块改良来开发的资源总量。
 We Love The King Day = “我们爱戴领袖日”
 WLTK+ = 庆祝数量
 Number of your cities celebrating\n'We Love The King Day' thanks\nto access to this resource = 由于对此类资源的接入，\n您城市正在庆祝“我们爱戴领袖日”的城市数量
@ -1642,7 +1629,7 @@ We have signed a Declaration of Friendship with [otherCiv]! = 我们已经与[ot
 Basics = 基础
 Resources = 资源
 Terrains = 地形
-Tile Improvements = 地块设施
+Tile Improvements = 地块改良
 Unique to [civName], replaces [unitName] = 为[civName]文明独有内容，其替代了：[unitName]
 Unique to [civName] = [civName]独有
 Tutorials = 教程
@ -1659,25 +1646,24 @@ Occurs on [listOfTerrains] = 可能出现在以下地形：[listOfTerrains]
 Occurs on: = 出现在：
 Placed on [terrainType] = 可出现在[terrainType]之上
 Can be found on = 可能发现该资源的地形地貌：
-Improved by [improvement] = 开发该资源所需设施：[improvement]
-Bonus stats for improvement = 开发该资源后设施所获奖励效果：
+Improved by [improvement] = 开发该资源所需改良：[improvement]
+Bonus stats for improvement = 开发该资源后改良所获奖励效果：
 Buildings that consume this resource = 消耗该资源的建筑：
 Buildings that provide this resource = 提供该资源的建筑：
-Improvements that provide this resource = 提供该资源的地块设施：
- # Requires translation!
-Buildings that require this resource improved near the city = 
+Improvements that provide this resource = 提供该资源的地块改良：
+Buildings that require this resource improved near the city = 需要城市附近有已改良该资源的建筑
 Units that consume this resource = 消耗该资源的单位有
-Can be built on = 可以建造在
+Can be built on = 可以建造
 Cannot be built on = 不可建造
 or [terrainType] = 或[terrainType]
-Can be constructed by = 可被建造。需要
-Can be created instantly by = 可以被立即创建。需要
+Can be constructed by = 可由其修建
+Can be created instantly by = 可由其立刻修建
 Defence bonus = 防御力加成
 Movement cost = 移动力消耗
 for = ，当建造在拥有下列资源的地块上时：
 Missing translations: = 未翻译的词条：
 Create = 创建
-Improvements = 设施
+Improvements = 改良
 Loading... = 加载中...
 Filter: = 过滤条件:
 OK = 确定
@ -1685,7 +1671,7 @@ Map is incompatible with the chosen ruleset! = 该地图与选中的规则集不
 Base terrain [terrain] does not exist in ruleset! = 规则集中不存在基础地形[terrain]！
 Terrain feature [feature] does not exist in ruleset! = 地貌[feature]在规则集中不存在！
 Resource [resource] does not exist in ruleset! = 资源[resource]在规则集中不存在！
-Improvement [improvement] does not exist in ruleset! = 地块设施[improvement]在规则集中不存在！
+Improvement [improvement] does not exist in ruleset! = 地块改良[improvement]在规则集中不存在！
 Nation [nation] does not exist in ruleset! = 国家[nation]在规则集中不存在！
 Natural Wonder [naturalWonder] does not exist in ruleset! = 自然奇观[naturalWonder]在规则集中不存在！
 non-[filter] = 非[filter]
@ -1741,7 +1727,7 @@ Gold cost modifier: [amount]%¤ = 金钱购买力：[amount]%¤
 Science cost modifier: [amount]%⍾ = 科研成本：[amount]%⍾
 Culture cost modifier: [amount]%♪ = 文化需求量：[amount]%♪
 Faith cost modifier: [amount]%☮ = 信仰需求量：[amount]%☮
-Improvement build length modifier: [amount]%⏳ = 地块设施建造时长：[amount]%⏳
+Improvement build length modifier: [amount]%⏳ = 地块改良建造时长：[amount]%⏳
 Diplomatic deal duration: [amount] turns⏳ = 外交周期时长：[amount]回合⏳
 Gold gift influence gain modifier: [amount]%¤ = 城邦赠礼所获影响力: [amount]%¤
 City-state tribute scaling interval: [amount] turns⏳ = 城邦进贡间隔：[amount] 回合⏳
@ -1750,8 +1736,8 @@ Golden age length modifier: [amount]%⌣ = 黄金时代时长：[amount]%⌣
 Adjacent city religious pressure: [amount]☮ = 相邻城市宗教传播压力：[amount]☮
 Peace deal duration: [amount] turns⏳ = 和平条约时长：[amount]回合⏳
 Start year: [comment] = 起始年代[comment]
-Pillaging this improvement yields [stats] = 劫掠该地块设施可获得[stats]
-Pillaging this improvement yields approximately [stats] = 劫掠该地块设施可获得约[stats]
+Pillaging this improvement yields [stats] = 劫掠该地块改良可获得[stats]
+Pillaging this improvement yields approximately [stats] = 劫掠该地块改良可获得约[stats]
 Needs removal of terrain features to be built = 在建造前需先移除地貌
 Air Intercept Range: [amount] = 空中扫荡范围：[amount]
 Unit type = 单位类型
@ -2119,9 +2105,9 @@ Enables conversion of city production to [civWideStat] = 允许在城市中将
 Improves movement speed on roads = 提高道路上的移动速度
 Roads connect tiles across rivers = 道路/铁路可跨河建造
 [relativeAmount]% maintenance on road & railroads = 道路/铁路维护费[relativeAmount]%
-No Maintenance costs for improvements in [tileFilter] tiles = 在[tileFilter]地块的设施无维修费用
-[relativeAmount]% construction time for [improvementFilter] improvements = 对 [improvementFilter] 地块设施 [relativeAmount]% 的建造时间
-Can build [improvementFilter] improvements at a [relativeAmount]% rate = 可以以[relativeAmount]%的速度建造[improvementFilter]地块改进设施。
+No Maintenance costs for improvements in [tileFilter] tiles = 在[tileFilter]地块的改良无维修费用
+[relativeAmount]% construction time for [improvementFilter] improvements = 对 [improvementFilter] 地块改良 [relativeAmount]% 的建造时间
+Can build [improvementFilter] improvements at a [relativeAmount]% rate = 可以以[relativeAmount]%的速度建造[improvementFilter]地块改进改良。
 [relativeAmount]% maintenance cost for buildings [cityFilter] = [cityFilter][relativeAmount]%建筑维护费
 Remove [buildingFilter] [cityFilter] = 移除[cityFilter]城市的[buildingFilter]
 Sell [buildingFilter] buildings [cityFilter] = 拆毁[cityFilter]的[buildingFilter]（返还少量金钱）
@ -2221,11 +2207,10 @@ Connects trade routes over water = 通过海路建立贸易路线
 Automatically built in all cities where it is buildable = 在所有可建造的城市中自动建造
 Creates a [improvementName] improvement on a specific tile = 可以在一个特定的地块上建造[improvementName]
 Founds a new city = 建立新城市
- # Requires translation!
-Founds a new puppet city = 
-Can instantly construct a [improvementFilter] improvement = 可立即建造[improvementFilter]地块设施
-May create improvements on water resources = 可在水上资源建造设施
-Can build [improvementFilter/terrainFilter] improvements on tiles = 可以建造地块设施：[improvementFilter/terrainFilter]
+Founds a new puppet city = 建立新傀儡城市
+Can instantly construct a [improvementFilter] improvement = 可立即建造[improvementFilter]地块改良
+May create improvements on water resources = 可在水上资源建造改良
+Can build [improvementFilter/terrainFilter] improvements on tiles = 可以建造地块改良：[improvementFilter/terrainFilter]
 Can Spread Religion = 可以传播宗教
 Can remove other religions from cities = 可以驱除城市异教
 May found a religion = 可创建一个宗教
@ -2311,7 +2296,7 @@ Invisible to non-adjacent units = 对非相邻单位隐身
 Can see invisible [mapUnitFilter] units = 能发现隐形的[mapUnitFilter]单位
 May upgrade to [unit] through ruins-like effects = 可在废墟中升级为[unit]
 Can upgrade to [unit] = 可升级为[unit]
-Destroys tile improvements when attacking = 攻击时摧毁地块设施
+Destroys tile improvements when attacking = 攻击时摧毁地块改良
 Cannot move = 不可移动
 Double movement in [terrainFilter] = 在[terrainFilter]中拥有双倍移动力
 All tiles cost 1 movement = 进行移动力损耗计算时忽略所有影响
@ -2375,7 +2360,7 @@ Gives a defensive bonus of [relativeAmount]% = 提供[relativeAmount]%防御力
 Costs [amount] [stat] per turn when in your territory = 建在你的领土内时每回合扣除[amount][stat] 
 Costs [amount] [stat] per turn = 每回合扣除[amount][stat] 
 Adjacent enemy units ending their turn take [amount] damage = 相邻的敌方单位结束回合时受到[amount]伤害
-Great Improvement = 伟人设施
+Great Improvement = 伟人改良
 Provides a random bonus when entered = 有单位进入则提供随机奖励
 Unpillagable = 不可劫掠
 Irremovable = 不可劫掠且不可摧毁
@ -2542,10 +2527,9 @@ upon constructing [buildingFilter] = 一旦建造[buildingFilter]
 upon constructing [buildingFilter] [cityFilter] = 一旦[cityFilter]建造[buildingFilter]
 upon gaining a [baseUnitFilter] unit = 一旦获得[baseUnitFilter]单位
 upon turn end = 回合结束时
- # Requires translation!
-upon turn start = 
-upon founding a Pantheon = 创建万神殿时
-upon founding a Religion = 创建宗教时
+upon turn start = 回合开始时
+upon founding a Pantheon = 创立万神殿时
+upon founding a Religion = 创立宗教时
 upon enhancing a Religion = 强化宗教时
 upon damaging a [mapUnitFilter] unit = 攻击[mapUnitFilter]单位时
 upon defeating a [mapUnitFilter] unit = 击败[mapUnitFilter]单位时
@ -2559,8 +2543,7 @@ 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]地块后
- # Requires translation!
-upon entering a [tileFilter] tile = 
+upon entering a [tileFilter] tile = 一旦踏入[tileFilter]
 for [amount] turns = 持续[amount]回合
 hidden from users = 对玩家隐藏
 for every [countable] = 每有1个[countable]
@ -2723,7 +2706,7 @@ Desirable = 想要的

 ######### Improvement Filters ###########

-Improvement = 地块设施
+Improvement = 地块改良
 Great = 伟人

 ######### resourceFilter ###########
@ -5083,9 +5066,9 @@ Remove Road = 拆毁道路

 Remove Railroad = 拆除铁路

-Cancel improvement order = 取消建造设施
+Cancel improvement order = 取消建造改良

-Repairs a pillaged Improvement or Route = 修理一个被劫掠的地块设施或路线
+Repairs a pillaged Improvement or Route = 修理一个被劫掠的地块改良或路线

 Academy = 学院

@ -5846,8 +5829,8 @@ Explore the map until you encounter another civilization! = 探索地图，直
 Open the options dialog! = 打开“选项”对话框！
 Click the menu button (top left) → Click 'Options'. = 点击左上角菜单按钮→点击“选项”。

-Construct an improvement! = 建造改良设施！
-Construct a Worker unit → Move it to a Plains or Grassland tile → Click 'Construct improvement' → Choose the farm → Leave the worker there until it's finished. = 组建工人单位→移动至平原或草原→点击“建造设施”→选择农场→直至工人建造完毕。
+Construct an improvement! = 建造改良改良！
+Construct a Worker unit → Move it to a Plains or Grassland tile → Click 'Construct improvement' → Choose the farm → Leave the worker there until it's finished. = 组建工人单位→移动至平原或草原→点击“建造改良”→选择农场→直至工人建造完毕。

 Create a trade route! = 创建一条贸易线路！
 Construct roads between your capital and another city. Or, automate your worker and let him get to that eventually. = 用道路将你的首都和其他城市连接起来；或者使工人自动工作，他们最终会连接城市。
@ -6850,7 +6833,7 @@ Researching a Technology in the next Era will advance you into that Era and trig
 Since new Technologies tend to give access to better Units, Buildings, and even unlock powerful new Policies, staying ahead of the competition is one of the best ways to secure your Victory! = 由于新技科技往往可以提供更好的单位、建筑，甚至解锁强大的新政策，领先于竞争对手是确保您获得胜利的最佳方式之一！

 Ah Gold. The Universal Medium of Exchange. Everyone loves Gold! They say it can't buy Happiness, but nuclear submarines are almost as good. = 黄金是通用的交换媒介。每个人都喜欢黄金！有钱不一定幸福，但没钱一定不幸福。
-You can earn more Gold from Tiles, Resources, Improvements, and eventually Buildings, Specialists, and Trade Routes. Ancient Ruins, meeting new City-States, and Pillaging are also great sources of Gold. During a Golden Age every Tile that already yields Gold will yield an additional Gold! = 您可以通过地块、资源、改良设施，以及最终的建筑、专家和贸易路线来赚取更多黄金。古代遗迹、遇见新的城邦和掠夺也是黄金的绝佳来源。在黄金时代，每个已经产出黄金的地块将额外产出黄金！
+You can earn more Gold from Tiles, Resources, Improvements, and eventually Buildings, Specialists, and Trade Routes. Ancient Ruins, meeting new City-States, and Pillaging are also great sources of Gold. During a Golden Age every Tile that already yields Gold will yield an additional Gold! = 您可以通过地块、资源、改良改良，以及最终的建筑、专家和贸易路线来赚取更多黄金。古代遗迹、遇见新的城邦和掠夺也是黄金的绝佳来源。在黄金时代，每个已经产出黄金的地块将额外产出黄金！
 Gold is how you pay for Building Maintenance, Transportation Upkeep, and Unit Upkeep. If you run out of Gold, first you'll receive penalties to your ⍾Science production, then eventually your Units will start Disbanding as you can't pay their upkeep. = 黄金用于支付建筑维护、运输维护和单位维护费用。如果您用完了黄金，首先您的⍾科科研产量将受到惩罚，最终您的单位将开始解散，因为您无法支付他们的维护费用。
 Gold can be used to Buy Buildings and Units, helping bring up a new City or quickly build an Army. It can also buy Tiles to add to your City. It's also used to Upgrade your units from their older, obsolete forms to new, stronger versions. And investing it into a Research Agreement is a great way to convert it into ⍾Science. = 黄金可以用来购买建筑和单位，帮助建立新的城市或快速建立军队。它还可以购买地块以扩展您的城市。它还可以用来升级您的单位，从旧的、过时的形式升级到新的、更强的版本。将其投资于科研协定是将其转化为⍾科研的好方法。
 Gold is also very valuable in Diplomacy. You can directly Gift Gold to City-States to gain their favor. Use it to balance a Trade Deal with other Nations. Or demand every last drop after a successful war and your enemy sues for peace. = 黄金在外交中也非常有价值。您可以直接赠送黄金给城邦以获得他们的好感。用它来平衡与其他国家的贸易协议。或者在成功的战争后要求对方在求和时交出每一滴黄金。
@ -6896,10 +6879,10 @@ Enemy City = 敌方城市
 Cities can be conquered by reducing their health to 1, and entering the city with a melee unit.\nSince cities heal each turn, it is best to attack with ranged units and use your melee units to defend them until the city has been defeated! = 您已经包围了敌人的一座城市!\n当城市的耐久降至1时就可以被占领。\n只能使用近战单位占领城市。\n城市每回合会自动回复少许耐久，所以最好先使用远程单位攻击它，\n同时使用您的近战单位来保护远程单位，直到城市被占领!

 Luxury Resource = 奢侈资源
-Luxury resources within your domain and with their specific improvement are connected to your trade network.\nEach unique Luxury resource you have adds 5 happiness to your civilization, but extra resources of the same type don't add anything, so use them for trading with other civilizations! = 你的领土内的奢侈资源需要建造相应的设施来开发，已开发的奢侈资源可以用来与其他文明贸易。\n您拥有的每种独一无二的奢侈资源都会给您的文明+5快乐，\n每种奢侈资源只能提供一份快乐加成，数量超过1的同种资源并不会提供更多的快乐，\n所以用它们和其他文明进行贸易吧!
+Luxury resources within your domain and with their specific improvement are connected to your trade network.\nEach unique Luxury resource you have adds 5 happiness to your civilization, but extra resources of the same type don't add anything, so use them for trading with other civilizations! = 你的领土内的奢侈资源需要建造相应的改良来开发，已开发的奢侈资源可以用来与其他文明贸易。\n您拥有的每种独一无二的奢侈资源都会给您的文明+5快乐，\n每种奢侈资源只能提供一份快乐加成，数量超过1的同种资源并不会提供更多的快乐，\n所以用它们和其他文明进行贸易吧!

 Strategic Resource = 战略资源
-Strategic resources within your domain and with their specific improvement are connected to your trade network.\nStrategic resources allow you to train units and construct buildings that require those specific resources, for example the Horseman requires Horses. = 你的领土内的战略资源需要建造相应的设施来开发，已开发的战略资源可以用来与其他文明贸易。\n建造/组建特定的项目(单位/建筑)时将会消耗相应的战略资源。如需要消耗1单位的马来组建1个骑手单位，\n没有马就不能组建骑手。当该单位或建筑被摧毁时，此资源将能再次使用。\n如果获取资源途径出现中断，需要该资源的单位将受到战斗力减成，直至重新获得该资源。
+Strategic resources within your domain and with their specific improvement are connected to your trade network.\nStrategic resources allow you to train units and construct buildings that require those specific resources, for example the Horseman requires Horses. = 你的领土内的战略资源需要建造相应的改良来开发，已开发的战略资源可以用来与其他文明贸易。\n建造/组建特定的项目(单位/建筑)时将会消耗相应的战略资源。如需要消耗1单位的马来组建1个骑手单位，\n没有马就不能组建骑手。当该单位或建筑被摧毁时，此资源将能再次使用。\n如果获取资源途径出现中断，需要该资源的单位将受到战斗力减成，直至重新获得该资源。
 Unlike Luxury Resources, each Strategic Resource on the map provides more than one of that resource.\nThe top bar keeps count of how many unused strategic resources you own.\nA full drilldown of resources is available in the Resources tab in the Overview screen. = 与奢侈资源不同，地图上显示的每个战略资源图标将提供多于1单位的该种资源。\n顶部信息栏显示了你拥有多少未使用的战略资源。\n在概览界面点击“资源”按钮可以查看你所拥有资源的完整信息。

 The city can no longer put up any resistance!\nHowever, to conquer it, you must enter the city with a melee unit = 这座城市再也不能抵抗了!\n然而，要征服城市，请使用您的近战单位占领它。
@ -6918,7 +6901,7 @@ Injured Units = 受伤单位
 Injured units deal less damage, but recover after turns that they have been inactive.\nUnits heal 10 health per turn in enemy territory or neutral land,\n  20 inside your territory and 25 in your cities. = 报告大人，您的单位受伤了！\n受伤的单位会对敌方造成更少的伤害！您可能会好奇，怎么能治疗他们呢？其实很简单，您只需要在他们不受攻击的情况下原地待命，他们中的医疗兵就会开始工作了！\n在异国领土和无主的领土上，每回合会恢复10点生命值；在己方领土上，会恢复20点；在本方城市中，会恢复25点。

 Workers = 工人
-Workers are vital to your cities' growth, since only they can construct improvements on tiles.\nImprovements raise the yield of your tiles, allowing your city to produce more and grow faster while working the same amount of tiles! = 工人对您所在城市的发展至关重要，因为只有他们才能在地块上建造设施。\n设施可以提高地块的产出，\n当市民在建有设施的地块工作时，将给您的城市带来更多的收益，同时城市也会发展得更快。
+Workers are vital to your cities' growth, since only they can construct improvements on tiles.\nImprovements raise the yield of your tiles, allowing your city to produce more and grow faster while working the same amount of tiles! = 工人对您所在城市的发展至关重要，因为只有他们才能在地块上建造改良。\n改良可以提高地块的产出，\n当市民在建有改良的地块工作时，将给您的城市带来更多的收益，同时城市也会发展得更快。

 Siege Units = 攻城单位
 Siege units are extremely powerful against cities, but need to be Set Up before they can attack.\nOnce your siege unit is set up, it can attack from the current tile,\n  but once moved to another tile, it will need to be set up again. = 攻城单位对城市具有极强的毁灭力，但在进攻前必须先把它架设起来。\n您的攻城单位架设起来后，它就可以从当前的地块发起攻击，\n但是一旦它移动到其他地块，就需要重新架设。
@ -6928,16 +6911,11 @@ Once a certain tech is researched, your land units can embark, allowing them to
 Units are defenseless while embarked (cannot use modifiers), and have a fixed Defending Strength based on your tech Era, so be careful!\nRanged Units can't attack, Melee Units have a Strength penalty, and all have limited vision. = 在水中的陆军单位是没有反伤的，并且根据你的科技时代有一个固定的防御能力。所以你最好看好你在水中的单位。\n水中的陆地远程单位不能攻击，近战单位有攻击力削弱，所有的单位视力削弱。（在研究特定的科技后可以消除这些DeBuff哦）

 Idle Units = 空闲单位
- # Requires translation!
-Clicking 'Next unit' moves to the next idle unit in the queue (as listed in Overview -> Units). After issuing an order to an unit, if 'Auto Unit Cycle' in Options -> Gameplay is enabled, you will automatically select the next idle unit. = 
- # Requires translation!
-If you don't want to move a unit this turn, you can skip it by clicking 'Next unit' again, or command the unit to 'Skip turn'. = 
- # Requires translation!
-If you want to disable the 'Next unit' feature entirely, you can toggle it in Options -> Gameplay -> Check for idle units. = 
- # Requires translation!
-If you'd rather 'Next unit' cycle the units and not mark them as Done, you can change it in the Options -> Gameplay menu. = 
- # Requires translation!
-You can also cycle through the idle units using the left and right triangles on the Unit Table in the lower left of the screen. Or by default using the Cycle button next to the 'Next Unit' button. = 
+Clicking 'Next unit' moves to the next idle unit in the queue (as listed in Overview -> Units). After issuing an order to an unit, if 'Auto Unit Cycle' in Options -> Gameplay is enabled, you will automatically select the next idle unit. = 点击“下个闲置单位”按钮会移动到队列中的下一个闲置单位（如在“概览”->“单位”中所列出的）。如果在“选项”->“游戏内容”中启用了“自动循环单位”，那么在向一个单位下达命令后，系统将自动选择下一个闲置单位。
+If you don't want to move a unit this turn, you can skip it by clicking 'Next unit' again, or command the unit to 'Skip turn'. = 如果你不想在这一回合移动某个单位，可以通过再次点击“下个闲置单位”按钮跳过它，或者命令该单位“跳过回合”。
+If you want to disable the 'Next unit' feature entirely, you can toggle it in Options -> Gameplay -> Check for idle units. = 如果你想要完全禁用“下个闲置单位”功能，可以在“选项”->“游戏内容”->“回合结束前查看闲置单位”中切换该选项。
+If you'd rather 'Next unit' cycle the units and not mark them as Done, you can change it in the Options -> Gameplay menu. = 如果你希望“下个闲置单位”功能在循环单位时不将它们标记为“已完成”，你可以在“选项”->“游戏内容”菜单中进行更改。
+You can also cycle through the idle units using the left and right triangles on the Unit Table in the lower left of the screen. Or by default using the Cycle button next to the 'Next Unit' button. = 你还可以通过屏幕左下角的单位表中的左右三角按钮来循环浏览闲置单位。或者，默认情况下，也可以使用“下个闲置单位”按钮旁边的“循环”按钮来实现。

 Contact Me = 联系我吧！
 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. = 很好!当您已经熟悉了游戏的大部分内容，\n您会发现游戏目前是不完整的，它还处于开发状态。\n不过Unciv将永远是开源和免费的，\n这意味着您无须担心广告或付费问题。
@ -6945,7 +6923,7 @@ What motivates me to keep working on it, \n  besides the fact I think it's amazi
 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) = 如果喜欢它，请到Play Store对它进行评价。\n如果您发现了游戏存在的问题或有什么好的意见和建议，\n请联系我！\n我的email地址：yairm210@hotmail.com，\nGitHub项目页面：https://github.com/yairm210/Unciv。

 Pillaging = 劫掠地块
-Military units can pillage improvements, which heals them 25 health and ruins the improvement.\nThe tile can still be worked, but advantages from the improvement - stat bonuses and resources - will be lost.\nWorkers can repair these improvements, which takes less time than building the improvement from scratch.\nPillaging certain improvements will result in your units looting gold from the improvement. = 军事单位可以劫掠地块设施，“劫掠”可以回复单位25点生命值同时将设施化为废墟。\n被“劫掠”的地块仍旧可以工作，但从地块设施获得的效果——例如基本资源加成和战略资源收益——将会消失。\n工人可以修复这些化为废墟的设施，所花费时间将比重新建造它们要少。\n劫掠特定的地块设施（比如牧场）可以为您带来金钱的收入。
+Military units can pillage improvements, which heals them 25 health and ruins the improvement.\nThe tile can still be worked, but advantages from the improvement - stat bonuses and resources - will be lost.\nWorkers can repair these improvements, which takes less time than building the improvement from scratch.\nPillaging certain improvements will result in your units looting gold from the improvement. = 军事单位可以劫掠地块改良，“劫掠”可以回复单位25点生命值同时将改良化为废墟。\n被“劫掠”的地块仍旧可以工作，但从地块改良获得的效果——例如基本资源加成和战略资源收益——将会消失。\n工人可以修复这些化为废墟的改良，所花费时间将比重新建造它们要少。\n劫掠特定的地块改良（比如牧场）可以为您带来金钱的收入。

 Experience = 经验
 Units that enter combat gain experience, which can then be used on promotions for that unit.\nUnits gain more experience when in Melee combat than Ranged, and more when attacking than when defending. = 战斗中单位获得的经验可用于该单位的晋升。\n单位在近战攻击时获得的经验大于远程攻击时，在进攻时获得的经验大于防御时。
@ -6979,17 +6957,17 @@ See also Great People = 另见伟人
 Great People = 伟人
 Certain buildings, and specialists in cities, generate Great Person points per turn.\nThere are several types of Great People, and their points accumulate separately.\nThe number of points per turn and accumulated points can be viewed in the Overview screen. = 特定的建筑和城市中的专业人员，每回合会产生伟人点数。\n不同类型的伟人，他们的点数积累分别独立计算。\n每回合可获得的伟人点数和已积累的伟人点数可以在概览界面查看。
 Alternatively, the Great Person points breakdown per city can be viewed in each City Screen (see UI Tips article). = 或者，每个城市中伟人点数的来源明细可以在每个城市屏幕中查看（参见用户界面提示文章）。
-Once enough points have been accumulated, a Great Person of that type will be created!\nEach Great Person can construct a certain Great Improvement which gives large yields over time, or immediately consumed to provide a certain bonus now. = 一旦点数累积足够，一位伟人将会诞生！\n伟人可以建造相应的伟人设施以提供持续的高收益；也可以被立即消耗来提供一定的奖励。
-Great Improvements also provide any strategic resources that are under them, so you don't need to worry if resources are revealed underneath your improvements! = 伟人设施同时还有开发其所在地块战略资源的功能，所以请不必担心伟人设施所在地块的战略资源开发问题！
+Once enough points have been accumulated, a Great Person of that type will be created!\nEach Great Person can construct a certain Great Improvement which gives large yields over time, or immediately consumed to provide a certain bonus now. = 一旦点数累积足够，一位伟人将会诞生！\n伟人可以建造相应的伟人改良以提供持续的高收益；也可以被立即消耗来提供一定的奖励。
+Great Improvements also provide any strategic resources that are under them, so you don't need to worry if resources are revealed underneath your improvements! = 伟人改良同时还有开发其所在地块战略资源的功能，所以请不必担心伟人改良所在地块的战略资源开发问题！
 See also Specialists = 另见专家

 Removing Terrain Features = 清除地貌
-Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to add improvements exploiting those resources. = 某些地块含有地貌，如冲积平原或森林。其中一些图层（如丛林、沼泽和森林）可以由工人清除。\n清除地貌不会删除地块中的任何资源，通常需要"清除地貌"才能添加利用这些资源的设施。
+Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to add improvements exploiting those resources. = 某些地块含有地貌，如冲积平原或森林。其中一些图层（如丛林、沼泽和森林）可以由工人清除。\n清除地貌不会删除地块中的任何资源，通常需要"清除地貌"才能添加利用这些资源的改良。

 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, ⍾Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = 自然奇观，例如富士山、直布罗陀岩和大堡礁，是独特的、不可逾越的地形特征，是大自然的杰作，它们具有使其与普通地形截然不同的特殊品质。\n如果由您的城市开发，它们可以为您带来大量的文化、⍾科研、金钱或产能，这就是为什么您可能需要尽快将它们纳入您的帝国。

 Keyboard = 关于键盘
-If you have a keyboard, some shortcut keys become available. Unit command or improvement picker keys, for example, are shown directly in their corresponding buttons. = 如果您有键盘，则可以使用一些快捷键。例如，单位指令或地块设施选择的快捷键直接显示在其相应的按钮中。
+If you have a keyboard, some shortcut keys become available. Unit command or improvement picker keys, for example, are shown directly in their corresponding buttons. = 如果您有键盘，则可以使用一些快捷键。例如，单位指令或地块改良选择的快捷键直接显示在其相应的按钮中。
 On the world screen the hotkeys are as follows: = 在世界地图界面上的热键如下:
 Space or 'N' - Next unit or turn\n'E' - Empire overview (last viewed page)\n'+', '-' - Zoom in / out\nHome - center on capital or open its City Screen if already centered = 空格键 or 'N' - 下个闲置单位 or 下一回合\n'E' - 概览界面（最近浏览的页面）\n'+', '-' - 放大 / 缩小\n回车键 - 当前游玩文明的首都显示在屏幕中心（如果已经位于屏幕中心则打开城市界面）
 F1 - Open Civilopedia\nF2 - Empire overview Trades\nF3 - Empire overview Units\nF4 - Empire overview Diplomacy\nF5 - Social policies\nF6 - Technologies\nF7 - Empire overview Cities\nF8 - Victory Progress\nF9 - Empire overview Stats\nF10 - Empire overview Resources\nF11 - Quicksave\nF12 - Quickload = F1 - 打开文明百科\nF2 - 贸易概览\nF3 - 单位概览\nF4 - 外交概览\nF5 - 社会政策\nF6 - 科技\nF7 - 城市概览\nF8 - 胜利进度\nF9 - 统计概览\nF10 - 资源概览\nF11 - 快速保存\nF12 - 快速读取
@ -7005,8 +6983,7 @@ This is where you spend most of your time playing Unciv. See the world, control
 ⑥: Unit Action Buttons - while a unit is selected its possible actions appear here. = ⑥: 单位指令按钮 - 当一个单位处于选中状态，它的所有可操作指令将显示在此位置。
 ⑦: The unit/city info pane - shows information about a selected unit or city. = ⑦: 单位/城市信息面板 - 显示所选单位/城市的信息。
 ⑧: The name (and unit icon) of the selected unit or city, with current health if wounded. Clicking a unit name or icon will open its civilopedia entry. = ⑧：所选单位/城市的名称（如果所选的是单位，还将显示单位图标）。如果单位/城市受到伤害，则名称后会显示当前生命值。点击单位名称/图标将打开相应的文明百科条目。
- # Requires translation!
-⑨: The arrow buttons allow jumping to the next/previous idle unit. = 
+⑨: The arrow buttons allow jumping to the next/previous idle unit. = ⑨：箭头按钮可以用来跳转到下一个或上一个闲置单位。
 ⑩: For a selected unit, its promotions appear here, and clicking leads to the promotions screen for that unit. = ⑩: 晋升选项 - 点击可晋升单位，进入其晋升界面。
 ⑪: Remaining/per turn movement points, strength and experience / XP needed for promotion. For cities, you get its combat strength. = ⑪: 单位的基础移动力和剩余移动力、战斗力、单位已获得的经验值和晋升需要的经验值。对于城市，此处将显示城市的战斗力和轰击战斗力。
 ⑫: This button closes the selected unit/city info pane. = ⑫: 此按钮用于关闭单位/城市信息面板。
@ -7014,7 +6991,7 @@ This is where you spend most of your time playing Unciv. See the world, control
 ⑭: Below that are strength bonuses or penalties and health bars projecting before / after the attack. = ⑭: 下面是攻击前/后的生命值条和力量加成或惩罚。
 ⑮: The Attack Button - let blood flow! = ⑮: 攻击按钮 - 一旦发动，浮尸千里，血流成河！
 ⑯: The minimap shows an overview over the world, with known cities, terrain and fog of war. Clicking will position the main map. = ⑯: 小地图可概览整个世界地图，包括已知城市、地形和战争迷雾。点击小地图上某一点，世界地图将直接定位到对应的具体位置。
-⑰: To the side of the minimap are display feature toggling buttons - tile yield, worked indicator, show/hide resources. These mirror setting on the options screen and are hidden if you deactivate the minimap. = ⑰: 小地图的左侧显示的是功能切换按钮 - 用来切换地块产出、工作地块、资源与设施等信息的显示/隐藏。这些设置项同样可以在选项界面找到。如果您停用小地图，这些按钮将会隐藏。
+⑰: To the side of the minimap are display feature toggling buttons - tile yield, worked indicator, show/hide resources. These mirror setting on the options screen and are hidden if you deactivate the minimap. = ⑰: 小地图的左侧显示的是功能切换按钮 - 用来切换地块产出、工作地块、资源与改良等信息的显示/隐藏。这些设置项同样可以在选项界面找到。如果您停用小地图，这些按钮将会隐藏。
 ⑱: Tile information for the selected hex - current or potential yield, terrain, effects, present units, city located there and such. Where appropriate, clicking a line opens the corresponding civilopedia entry. = ⑱: 所选项目详细信息界面 - 当前或潜在产出、地形、单位等。点击可跳转行即可进入其对应的百科条目。
 ⑲: Notifications - what happened during the last 'next turn' phase. Some are clickable to show a relevant place on the map, some even show several when you click repeatedly. = ⑲: 通知 - 上一回合发生的事件。点击部分通知可跳转至地图相关位置，部分通知重复点击时会显示多个相关位置。
 ⑳: The Next Turn Button - unless there are things to do, in which case the label changes to 'next unit', 'pick policy' and so on. = ⑳: 下一回合按钮 - 根据设置和游戏状态，按钮有时可能显示为 “下个闲置单位”、“选择一项社会政策” 等。
@ -7214,7 +7191,7 @@ Citizen Conversion\nIn Civilization V, a citizen is born religious if the parent
 Unassigned Citizens\nIn Civilization V, unassigned citizens are considered specialists, and subject to the same type of bonuses (e.g. Korea's ability). It can be worthwhile to leave citizens unassigned, instead of being assigned to a tile. Not applicable to Unciv. = 未分配市民\n在文明V中，未分配市民被视为专家，并受到相同类型的奖励（例如朝鲜的特殊能力）影响；有时将市民保持未分配可能比分配到地块上更值得。不适用于Unciv。
 Settler Construction\nIn Civilization V, cities can't starve when constructing settlers, so you can assign all citizens to production tiles and none to food tiles. In Unciv, citizens keep consuming two food per turn. = 组建移民\n在文明V中，建造殖民者时城市不会挨饿，因此你可以将所有市民分配到生产地块，而不是分配到食物地块。在Unciv中，市民每回合仍会消耗两个食物。
 Water Melee Attack\nAs result of a Discord poll, Water Melee units can attack military land units on the shore, unlike in Civilization V. = 水陆突袭\n根据Discord上的投票结果，水陆突袭单位可以袭击岸上的军事陆地单位，这与文明V不同。
-Tile improvements\nIn Civilzation V, workers start working on an improvement-under-construction at the beginning of movement. Unciv changes this, to allow players to assign workers to tiles, and then reconsider and change improvement or move them elsewhere. = 地块改良设施\n在文明V中，工人在移动时开始建造一个正在建设的改良设施。Unciv不同，可以让玩家将工人分配到地块上，然后重新考虑并更改改良设施或将它们移动工人。
+Tile improvements\nIn Civilzation V, workers start working on an improvement-under-construction at the beginning of movement. Unciv changes this, to allow players to assign workers to tiles, and then reconsider and change improvement or move them elsewhere. = 地块改良\n在文明V中，工人在移动时开始建造一个正在建设的改良。Unciv不同，可以让玩家将工人分配到地块上，然后重新考虑并更改改良或将它们移动工人。
 Forest and Jungle Visibility\nIn Unciv, forests and jungles are visible 1 tile outside visibility range. In Civilization V, this is the behaviour of hills and mountains, but not of forests and jungles, yet jungle and forest can block hills, and hill + forest can block mountain, indicating they're on the same elevation. This is considered to be a bug in the otherwise well-structured visibility logic in Civilization V. = 森林和丛林的视野\n在Unciv中，森林和丛林的视野比视野范围大1个地块。在文明V中，这是山丘和山脉的行为，但不适用于森林和丛林，然而丛林和森林可以阻塞山丘，山丘+森林可以阻塞山脉，表明它们处于同一高度。在文明V中，与其他逻辑相比，这被认为是一个错误。

 Founding Cities\nThe Settler is a unit that can found a new city. You can build a Settler unit in a city with at least 2 population, and then move them to a good location to found a new city. This will usually be your main way of acquiring more cities. = 建城\n移民是一个可以建立新城市的单位：你可以在至少有2个人口的城市中建造移民，然后将它们移动到一个好地块来建立一个新城市。这通常是你获取更多城市的主要途径。
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@ -96,10 +96,8 @@ New [civName]\n(formerly known as [cityName]) = Nueva [civName]\n(anteriormente
 Requires [buildingName] to be built in the city = Requiere un [buildingName] en la ciudad
 Requires [buildingName] to be built in all cities = Requiere un [buildingName] en cada ciudad
 Provides a free [buildingName] in the city = Proporciona un [buildingName] gratis en la ciudad
- # Requires translation!
-Requires improved [resource] near city = 
- # Requires translation!
-Requires at least one of the following resources improved near the city: = 
+Requires improved [resource] near city = Requiere [resource] mejorado cerca de la ciudad
+Requires at least one of the following resources improved near the city: = Requiere al menos uno de los siguientes recursos mejorados cerca de la ciudad:
 Wonder is being built elsewhere = Esta Maravilla se está construyendo en otro lugar
 National Wonder is being built elsewhere = Esta Maravilla Nacional se está construyendo en otro lugar
 Requires a [buildingName] in all [cityFilter] cities = Requiere un/a [buildingName] en todas las ciudades [cityFilter]
@ -377,8 +375,7 @@ Start game! = ¡Empezar partida!
 Map Options = Opciones del Mapa
 Game Options = Opciones de Partida
 Civilizations = Civilizaciones
- # Requires translation!
-Shuffle Civ Order at Start = 
+Shuffle Civ Order at Start = Mezclar el orden de las civ al inicio
 Map Type = Mapa
 Map file = Escoger mapa
 Max Turns = ⏳Turnos Máximos
@ -817,8 +814,7 @@ Hidden = Ocultas
 Visible = Visibles
 Permanent = Permanentes

- # Requires translation!
-Show minimap = 
+Show minimap = Mostrar minimapa

 Show tutorials = Mostrar Tutoriales
 Reset tutorials = Reiniciar tutoriales
@ -854,8 +850,7 @@ Gameplay = Jugabilidad
 Check for idle units = Verificar Unidades inactivas
 'Next unit' button cycles idle units = El botón de 'Siguiente unidad' activa y desactiva las unidades inactivas
 Auto Unit Cycle = Ciclo Aut. de Unidades
- # Requires translation!
-Show Small Skip/Cycle Unit Button = 
+Show Small Skip/Cycle Unit Button = Mostrar pequeño botón de salto/ciclo unidad 
 Move units with a single tap = Mover Unidades con un solo toque
 Move units with a long tap = Mover unidades con toque prolongado
 Auto-assign city production = Construcción Automática en las Ciudades
@ -1656,8 +1651,7 @@ Bonus stats for improvement = Atributos bonus de la mejora
 Buildings that consume this resource = Edificios que consumen este recurso
 Buildings that provide this resource = Edificios que proveen este recurso
 Improvements that provide this resource = Mejoras que proveen este recurso
- # Requires translation!
-Buildings that require this resource improved near the city = 
+Buildings that require this resource improved near the city = Edificios que requieren este recurso mejorado cerca de la ciudad
 Units that consume this resource = Unidades que consumen este recurso
 Can be built on = Se puede construir en
 Cannot be built on = No se puede construir en
@ -6917,14 +6911,11 @@ Once a certain tech is researched, your land units can embark, allowing them to
 Units are defenseless while embarked (cannot use modifiers), and have a fixed Defending Strength based on your tech Era, so be careful!\nRanged Units can't attack, Melee Units have a Strength penalty, and all have limited vision. = Las Unidades son indefensas al embarcar (no se benefician de modificadores), y tienen una Fuerza de Defensa fija dependiendo de la Era, ¡así que ten cuidado!\nUnidades de largo alcance no pueden atacar, Unidades Cuerpo a Cuerpo tienen penalidad al atacar, y todas tienen visión limitada.

 Idle Units = Unidades sin Utilizar
- # Requires translation!
-Clicking 'Next unit' moves to the next idle unit in the queue (as listed in Overview -> Units). After issuing an order to an unit, if 'Auto Unit Cycle' in Options -> Gameplay is enabled, you will automatically select the next idle unit. = 
+Clicking 'Next unit' moves to the next idle unit in the queue (as listed in Overview -> Units). After issuing an order to an unit, if 'Auto Unit Cycle' in Options -> Gameplay is enabled, you will automatically select the next idle unit. = Al hacer clic en "Siguiente unidad", se pasa a la siguiente unidad inactiva de la cola (como se indica en Descripción general -> Unidades). Después de dar una orden a una unidad, si está habilitado "Ciclo automático de unidad" en Opciones -> Juego, seleccionará automáticamente la siguiente unidad inactiva.
 If you don't want to move a unit this turn, you can skip it by clicking 'Next unit' again, or command the unit to 'Skip turn'. = Si no quieres mover una unidad este turno, puedes omitirla haciendo clic nuevamente en "Siguiente unidad" o ordenarle a la unidad que "Omita turno".
- # Requires translation!
-If you want to disable the 'Next unit' feature entirely, you can toggle it in Options -> Gameplay -> Check for idle units. = 
+If you want to disable the 'Next unit' feature entirely, you can toggle it in Options -> Gameplay -> Check for idle units. = Si deseas desactivar la función "Siguiente unidad" por completo, puedes activarla en Opciones -> Jugabilidad -> Verificar unidades inactivas.
 If you'd rather 'Next unit' cycle the units and not mark them as Done, you can change it in the Options -> Gameplay menu. = Si prefieres que 'Siguiente unidad' cicle las unidades y no las marques como Terminadas, puedes cambiarlo en el menú Opciones.
- # Requires translation!
-You can also cycle through the idle units using the left and right triangles on the Unit Table in the lower left of the screen. Or by default using the Cycle button next to the 'Next Unit' button. = 
+You can also cycle through the idle units using the left and right triangles on the Unit Table in the lower left of the screen. Or by default using the Cycle button next to the 'Next Unit' button. = También puedes recorrer las unidades inactivas usando los triángulos izquierdo y derecho en la Tabla de unidades en la parte inferior izquierda de la pantalla. O, de manera predeterminada, usando el botón Ciclo junto al botón "Siguiente unidad".

 Contact Me = Contacta conmigo
 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. = ¡Hey! Si has jugado hasta aquí es probable que hayas visto que el juego está sin acabar.\n Unciv está pensado para ser open-source y gratis, siempre.\n Esto significa que no habrá anuncios ni ninguna chorrada.
--- a/android/assets/jsons/translations/Thai.properties
+++ b/android/assets/jsons/translations/Thai.properties
--- 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 = 1102
-    const val appVersion = "4.15.10"
+    const val appCodeNumber = 1103
+    const val appVersion = "4.15.11"

    const val gdxVersion = "1.13.1"
    const val ktorVersion = "2.3.12"
--- a/changelog.md
+++ b/changelog.md
@ -1,3 +1,21 @@
+## 4.15.11
+
+Changed stockpile names to be human readable
+
+Units with logistics that attacked but did not move, no longer heal
+
+Fix automated road connections going through impassible tiles
+
+chore: Extract NeighborDirection to another file
+
+Resolved  - Applied text changes to UI elements
+
+UI: Fixed edges for edge tiles on word wrap maps
+
+Added feature to save unitType promotion. - By Emandac
+
+Add "Will be destroyed when pillaged" unique - By PLynx01
+
 ## 4.15.10

 modding: Validate tech row value
--- a/core/src/com/unciv/UncivGame.kt
+++ b/core/src/com/unciv/UncivGame.kt
@ -487,7 +487,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.15.10", 1102)
+        val VERSION = Version("4.15.11", 1103)
        //endregion

        /** Global reference to the one Gdx.Game instance created by the platform launchers - do not use without checking [isCurrentInitialized] first. */
--- a/fastlane/metadata/android/en-US/changelogs/1103.txt
+++ b/fastlane/metadata/android/en-US/changelogs/1103.txt
@ -0,0 +1,17 @@
+
+
+Changed stockpile names to be human readable
+
+Units with logistics that attacked but did not move, no longer heal
+
+Fix automated road connections going through impassible tiles
+
+chore: Extract NeighborDirection to another file
+
+Resolved  - Applied text changes to UI elements
+
+UI: Fixed edges for edge tiles on word wrap maps
+
+Added feature to save unitType promotion. - By Emandac
+
+Add "Will be destroyed when pillaged" unique - By PLynx01