diff --git a/android/assets/jsons/translations/Afrikaans.properties b/android/assets/jsons/translations/Afrikaans.properties index a0042d128b..e798213d0d 100644 --- a/android/assets/jsons/translations/Afrikaans.properties +++ b/android/assets/jsons/translations/Afrikaans.properties @@ -99,10 +99,8 @@ Requires at least one of the following: = Vereis ten minste een van die volgende Requires all of the following: = Vereis al die volgende: Leads to [techName] = Lei tot [techName] Leads to: = Lei tot: - # Requires translation! -Enables: = - # Requires translation! -Disables: = +Enables: = Aktiveer: +Disables: = Deaktiveer: Current construction = Huidige konstruksie Construction queue = Konstruksie tou @@ -121,12 +119,9 @@ Peace = Vrede Research Agreement = Navorsingsooreenkoms Declare war = Verklaar oorlog Declare war on [civName]? = Verklaar oorlog teen [civName]? - # Requires translation! -[civName] will also join them in the war = - # Requires translation! -An unknown civilization will also join them in the war = - # Requires translation! -This will cancel your defensive pact with [civName] = +[civName] will also join them in the war = [civName] sal ook in die ook met hulle aansluit in die oorlog +An unknown civilization will also join them in the war = 'n Onbekende beskawing sal ook met hulle aansluit in die oorlog +This will cancel your defensive pact with [civName] = Hierdie sal jou verdedigingsverdrag met [civName] kanselleer Go to on map = Gaan na op kaart Let's begin! = Laat ons begin! [civName] has declared war on us! = [civName] het oorlog teen ons verklaar! @@ -152,10 +147,8 @@ We will remember this. = Ons sal dit onthou. [civName] has declared war on [targetCivName]! = [civName] het oorlog teen [targetCivName] verklaar! [civName] and [targetCivName] have signed a Peace Treaty! = [civName] en [targetCivName] het 'n Vredesverdrag onderteken! - # Requires translation! -Declaration of Friendship = - # Requires translation! -[civName] and [targetCivName] have signed the Declaration of Friendship! = +Declaration of Friendship = Verklaring van Vriendskap +[civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] en [targetCivName] het 'n Verklaring van Vriendskap geteken [civName] has denounced [targetCivName]! = [civName] en [targetCivName] het die Verklaring van Vriendskap onderteken! Do you want to break your promise to [leaderName]? = Wil jy jou belofte aan [leaderName] verbreek? Break promise = Verbreek belofte @@ -276,8 +269,7 @@ Sum: = Totaal: Trade = Dryf handel Offer trade = Bied handel aan - # Requires translation! -They'll decide on their turn = +They'll decide on their turn = Hulle sal besluit op hulle beurt Retract offer = Trek aanbod terug What do you have in mind? = Wat het jy in gedagte? Our items = Ons items @@ -294,8 +286,7 @@ Keep going = Hou aan There's nothing on the table = Daar is niks op die tafel nie Peace Treaty = Vredesverdrag Agreements = Ooreenkomste - # Requires translation! -Defensive Pact = +Defensive Pact = Verdedigingsverdrag Open Borders = Oop Grense Gold per turn = Goud per beurt Cities = Stede @@ -311,16 +302,12 @@ Non-existent city = Nie-bestaande stad # Unit differences [resourceName] not required = [resourceName] nie benodig - # Requires translation! Lost ability (vs [originalUnit]): [ability] = - # Requires translation! -Upgrade all [count] [unit] ([cost] gold) = +Upgrade all [count] [unit] ([cost] gold) = Gradeer alles op [count] [unit] ([cost] goud) National ability = Nasionale vermoë [firstValue] vs [secondValue] = [firstValue] teen [secondValue] - # Requires translation! -Gained = - # Requires translation! -Lost = +Gained = Verkry +Lost = Verlore # New game screen @@ -329,14 +316,10 @@ Uniques = Uniek Promotions = Bevorderings Load copied data = Laai gekopieerde data Reset to defaults = Stel terug na verstek - # Requires translation! -Select nations = - # Requires translation! -Set available nations for random pool = - # Requires translation! -Available nations = - # Requires translation! -Banned nations = +Select nations = Selekteer nasies +Set available nations for random pool = Stel beskikbare nasies vir ewekansige poel +Available nations = Beskikbare nasies +Banned nations = Verbiede nasies Are you sure you want to reset all game options to defaults? = Is jy seker jy wil alle speletjie-opsies na verstekwaardes terugstel? Start game! = Begin spel! Map Options = Kaartopsies @@ -347,15 +330,12 @@ Map file = Kaart lêer Max Turns = Maksimum Beurte Could not load map! = Kon nie kaart laai nie! Generated = Gegenereer - # Requires translation! -Random Generated = - # Requires translation! -Which options should be available to the random selection? = +Random Generated = Ewekansig Gegenereer +Which options should be available to the random selection? = Watter opsies moet beskikbaar wees vir die ewekansige seleksie? Existing = Bestaande Custom = Pasgemaak Map Generation Type = Kaart Generasie Tipe - # Requires translation! -Enabled Map Generation Types = +Enabled Map Generation Types = Geaktiveerde Kaart Generasie Tipes Default = Verstek Pangaea = Pangaea Continent and Islands = Vasteland en Eilande @@ -364,23 +344,17 @@ Three Continents = Drie Vastelande Four Corners = Vier Hoeke Archipelago = Argipel Inner Sea = Binnesee - # Requires translation! -Perlin = +Perlin = Perlin # Requires translation! Random number of Civilizations = - # Requires translation! -Min number of Civilizations = - # Requires translation! -Max number of Civilizations = +Min number of Civilizations = Min hoeveelheid Beskawings +Max number of Civilizations = Maks hoeveelheid Beskawings # Requires translation! Random number of City-States = - # Requires translation! -Min number of City-States = - # Requires translation! -Max number of City-States = +Min number of City-States = Min hoeveelheid Stadstate +Max number of City-States = Maks hoeveelheid Stadstate One City Challenge = Een Stad Uitdaging - # Requires translation! -Enable Nuclear Weapons = +Enable Nuclear Weapons = Aktiveer Kernwapens No City Razing = Geen Stadsverwoesting No Barbarians = Geen Barbare Disable starting bias = Deaktiveer beginvooroordeel @@ -394,17 +368,14 @@ Domination = Oorheersing Cultural = Kultureel Diplomatic = Diplomaties Time = Tyd - # Requires translation! -Your previous options needed to be reset to defaults. = +Your previous options needed to be reset to defaults. = Jou vorige opsies moes na verstek herstel word. # Used for random nation indicator in empire selector and unknown nation icons in various overview screens. # Should be a single character, or at least visually square. - # Requires translation! -? = +? = ? Map Shape = Kaartvorm - # Requires translation! -Enabled Map Shapes = +Enabled Map Shapes = Geaktiveerde Kaart Vorms Hexagonal = Seskantig Flat Earth Hexagonal = Plat Aarde Seskantig Rectangular = Reghoekig @@ -414,10 +385,8 @@ Radius = Radius Enable Espionage = Aktiveer Spioenasie Resource Setting = Hulpbroninstelling - # Requires translation! -Enabled Resource Settings = - # Requires translation! -Other Settings = +Enabled Resource Settings = Geaktiveerde Hulpbroninstellings +Other Settings = Ander Instellings Sparse = Skaars Abundant = Volop Strategic Balance = Strategiese Balans @@ -443,8 +412,7 @@ Open Documentation = Maak dokumentasie oop Don't show again = Moenie weer vertoon nie World Size = Wêreld Grootte - # Requires translation! -Enabled World Sizes = +Enabled World Sizes = Geaktiveerde Wêreld Groottes Tiny = Baie Klein Small = Klein Medium = Medium @@ -483,20 +451,15 @@ Extension mods = Uitbreidingsmodifikasies Base ruleset: = Basis reëlstel: # Note - do not translate the colour names between «». Changing them works if you know what you're doing. The mod you selected is incorrectly defined! = Die mod wat jy gekies het is verkeerd gedefinieer! - # Requires translation! -The mod you selected is «RED»incorrectly defined!«» = -The mod combination you selected is incorrectly defined! = Die mod-kombinasie wat jy gekies het, is verkeerd gedefinieer! - # Requires translation! -The mod combination you selected is «RED»incorrectly defined!«» = +The mod you selected is «RED»incorrectly defined!«» = Die mod wat jy selekteer het is «RED»verkeerd gedefinieer!«» +The mod combination you selected is incorrectly defined! = Die mod-kombinasie wat jy selekteer het, is verkeerd gedefinieer! +The mod combination you selected is «RED»incorrectly defined!«» = Die mod-kombinasie wat jy selekteer het, is verkeerd gedefinieer! The mod combination you selected has problems. = Die mod-kombinasie wat jy gekies het, het probleme. You can play it, but don't expect everything to work! = Jy kan dit speel, maar moenie verwag dat alles sal werk nie! - # Requires translation! -The mod combination you selected «GOLD»has problems«». = - # Requires translation! -You can play it, but «GOLDENROD»don't expect everything to work!«» = +The mod combination you selected «GOLD»has problems«». = Die mod-kombinasie wat jy selekteer het «GOLD»het probleem«». +You can play it, but «GOLDENROD»don't expect everything to work!«» = Jy kan dit speel, maar «GOLDENROD»moenie verwag dat alles sal werk nie!«» This base ruleset is not compatible with the previously selected\nextension mods. They have been disabled. = Hierdie basisreëlstel is nie versoenbaar met die voorheen geselekteerde\n uitbreiding mods nie. Hulle is gedeaktiveer. - # Requires translation! -Are you really sure you want to play with the following known problems? = +Are you really sure you want to play with the following known problems? = Is jy regtig seker jy wil speel met die volgende bekende probleme? Base Ruleset = Basis reëls [amount] Techs = [amount] Tegnologieë [amount] Nations = [amount] Nasies @@ -515,106 +478,60 @@ Anything above 40 may work very slowly on Android! = Enigiets bo 40 kan baie sta # Map editor ## Tabs/Buttons - # Requires translation! -Map editor = - # Requires translation! -View = - # Requires translation! -Generate = - # Requires translation! -Partial = - # Requires translation! -Generator steps = - # Requires translation! -Edit = - # Requires translation! -Rivers = - # Requires translation! -Load = - # Requires translation! -Save = - # Requires translation! -New map = - # Requires translation! -Empty = - # Requires translation! -Save map = - # Requires translation! -Load map = - # Requires translation! -Delete map = - # Requires translation! -Are you sure you want to delete this map? = - # Requires translation! -It looks like your map can't be saved! = - # Requires translation! -Exit map editor = - # Requires translation! -Change map ruleset = - # Requires translation! -Change the map to use the ruleset selected on this page = - # Requires translation! -Revert to map ruleset = - # Requires translation! -Reset the controls to reflect the current map ruleset = - # Requires translation! -Features = - # Requires translation! -Starting locations = - # Requires translation! -Tile Matching Criteria = - # Requires translation! -Complete match = +Map editor = Kaart verwysiger +View = Beskou +Generate = Genereer +Partial = Gedeeltelik +Generator steps = Genereerder stappe +Edit = Verwysig +Rivers = Riviere +Load = Laai +Save = Teken aan +New map = Nuwe kaart +Empty = Leeg +Save map = Teken kaart aan +Load map = Laai kaart +Delete map = Skrap kaart +Are you sure you want to delete this map? = Is jy seker jy wil hierdie kaart skrap? +It looks like your map can't be saved! = Dit lyk soos jou kaart nie aangeteken kan word nie! +Exit map editor = Verlaat kaart verwysiger +Change map ruleset = Verander kaart reëlstel +Change the map to use the ruleset selected on this page = Verander die kaart om die reëlstel wat op hierdie blad selekteer was +Revert to map ruleset = Keer terug na kaart reëlstel +Reset the controls to reflect the current map ruleset = Herstel die kontroles om die huidige kaart reëlstel te reflekteer +Features = Kenmerke +Starting locations = Begin liggings +Tile Matching Criteria = Teël Ooreenstemming Kriteria +Complete match = Volle ooreenstemming # Requires translation! Except improvements = - # Requires translation! -Base and terrain features = - # Requires translation! -Base terrain only = - # Requires translation! -Land or water only = - # Requires translation! -Import a Wesnoth map = +Base and terrain features = Basis en terrein kenmerke +Base terrain only = Slegs basis terrein +Land or water only = Slegs land of water +Import a Wesnoth map = Voer 'n Wesnoth kaart in ## Labels/messages - # Requires translation! -Brush ([size]): = +Brush ([size]): = Kwas ([size]) # The single letter shown in the [size] parameter above for setting "Floodfill". # Please do not make this longer than one character, the associated slider will not handle well. # Requires translation! Floodfill_Abbreviation = - # Requires translation! -Error loading map! = - # Requires translation! -Map saved successfully! = - # Requires translation! -Current map RNG seed: [amount] = - # Requires translation! -Map copy and paste = - # Requires translation! -Position: [param] = - # Requires translation! -Starting location(s): [param] = - # Requires translation! -Continent: [param] ([amount] tiles) = - # Requires translation! -Resource abundance = - # Requires translation! -Change map to fit selected ruleset? = - # Requires translation! -Area: [amount] tiles, [amount2]% water, [amount3]% impassable, [amount4] continents/islands = - # Requires translation! -Do you want to leave without saving the recent changes? = - # Requires translation! -Leave = - # Requires translation! -Do you want to load another map without saving the recent changes? = - # Requires translation! -River generation failed! = - # Requires translation! -Please don't use step 'Landmass' with map type 'Empty', create a new empty map instead. = - # Requires translation! -This map has errors: = +Error loading map! = Fout met laai van kaart! +Map saved successfully! = Kaart suksesvol gelaai! +Current map RNG seed: [amount] = Huidige kaart RNG saad: [amount] +Map copy and paste = Kaart kopieer en plak +Position: [param] = Posisie: [param] +Starting location(s): [param] = Begin ligging(s): [param] +Continent: [param] ([amount] tiles) = Kontinent: [param] ([amount] teëls) +Resource abundance = Hulpbron hoeveelheid +Change map to fit selected ruleset? = Verander kaart om selekteerde reëlstel te pas? +Area: [amount] tiles, [amount2]% water, [amount3]% impassable, [amount4] continents/islands = Area: [amount] teëls, [amount2]% water, [amount3]% onbegaanbaar, [amount4] kontinente/eilande +Do you want to leave without saving the recent changes? = Wil jy verlaat sonder om die onlangse veranderings neer te teken? +Leave = Verlaat +Do you want to load another map without saving the recent changes? = Wil jy 'n ander kaart laai sonder om die onlangse veranderings neer te teken? +River generation failed! = Rivier generasie het misluk! +Please don't use step 'Landmass' with map type 'Empty', create a new empty map instead. = Moet asseblief nie die 'Landmas' stap met kaart tipe 'Leeg' gebruik nie, maak eerder 'n nuwe leë kaart. +This map has errors: = Hierdie kaart het foute: # Requires translation! The incompatible elements have been removed. = # Requires translation! diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 35dfa6bdec..1798539f21 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -2307,8 +2307,7 @@ From a randomly chosen tile [positiveAmount] tiles away from the ruins, reveal t Triggers the following global alert: [comment] = Aciona o seguinte alerta global: [comment] Every major Civilization gains a spy once a civilization enters this era = Cada grande civilização ganha um espião quando uma civilização entra nesta era Heal this unit by [positiveAmount] HP = Cure esta unidade em [positiveAmount] HP - # Requires translation! -This Unit takes [positiveAmount] damage = +This Unit takes [positiveAmount] damage = Esta unidade sofre [positiveAmount] de dano This Unit gains [amount] XP = Esta Unidade recebe [amount] de XP This Unit upgrades for free including special upgrades = Esta Unidade melhora de graça incluindo aprimoramentos especiais This Unit gains the [promotion] promotion = Esta Unidade ganha a promoção [promotion] diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties index 965b690bb8..35146e2ee0 100644 --- a/android/assets/jsons/translations/Catalan.properties +++ b/android/assets/jsons/translations/Catalan.properties @@ -147,8 +147,7 @@ We will remember this. = Ens en recordarem. [civName] has declared war on [targetCivName]! = [civName] ha declarat la guerra a [targetCivName]! [civName] and [targetCivName] have signed a Peace Treaty! = [civName] i [targetCivName] han signat un tractat de pau. - # Requires translation! -Declaration of Friendship = +Declaration of Friendship = Declaració d’amistat [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] i [targetCivName] han signat una declaració d’amistat. [civName] has denounced [targetCivName]! = [civName] ha denunciat a [targetCivName]. Do you want to break your promise to [leaderName]? = Voleu trencar el vostre compromís amb [leaderName]? @@ -1195,10 +1194,8 @@ Buy for [amount] gold = Compra amb [amount] d’or Buy = Compra Currently you have [amount] [stat]. = Ara mateix teniu [amount] [stat]. Would you like to purchase [constructionName] for [buildingGoldCost] [stat]? = Voleu comprar [constructionName] amb [buildingGoldCost] [stat]? - # Requires translation! -You are buying a religious unit in a city that doesn't follow the religion you founded ([yourReligion]). This means that the unit is tied to that foreign religion ([majorityReligion]) and will be less useful. = - # Requires translation! -Are you really sure you want to purchase this unit? = +You are buying a religious unit in a city that doesn't follow the religion you founded ([yourReligion]). This means that the unit is tied to that foreign religion ([majorityReligion]) and will be less useful. = Aneu a comprar una unitat religiosa en una ciutat que no segueix la religió que heu fundat, [yourReligion]. Això significa que la unitat estarà vinculada a una religió forastera, [majorityReligion], i serà menys útil. +Are you really sure you want to purchase this unit? = Esteu segur que voleu comprar aquesta unitat? Purchase = Compra No space available to place [unit] near [city] = No hi ha lloc per col·locar el [unit] a prop de [city]. Maintenance cost = Cost de manteniment @@ -2310,8 +2307,7 @@ From a randomly chosen tile [positiveAmount] tiles away from the ruins, reveal t Triggers the following global alert: [comment] = Provoca la següent alerta global: [comment] Every major Civilization gains a spy once a civilization enters this era = Quan una civilització entra a aquesta era, cada civilització principal obté un espia. Heal this unit by [positiveAmount] HP = Cura aquesta unitat [positiveAmount] de vida - # Requires translation! -This Unit takes [positiveAmount] damage = +This Unit takes [positiveAmount] damage = Aquesta unitat rep un dany de [positiveAmount] This Unit gains [amount] XP = Aquesta unitat guanya [amount] d’experiència This Unit upgrades for free including special upgrades = Aquesta unitat millora de franc, incloses les millores especials. This Unit gains the [promotion] promotion = Aquesta unitat guanya l’ascens [promotion]. @@ -2572,8 +2568,7 @@ Pan Up Alternate = Desplaça cap amunt (alternatiu) Pan Left Alternate = Desplaça cap a l’esquerra (alternatiu) Pan Down Alternate = Desplaça cap avall (alternatiu) Pan Right Alternate = Desplaça cap a la dreta (alternatiu) - # Requires translation! -Connect road = +Connect road = Connecta la carretera Transform = Transforma Repair = Repara Add to or remove from queue = Afegeix o treu de la cua @@ -2595,8 +2590,7 @@ Great People Detail = Detalls dels grans personatges Specialist Detail = Detalls dels especialistes Religion Detail = Detalls de la religió Buildings Detail = Detalls dels edificis - # Requires translation! -Open the Search Dialog = +Open the Search Dialog = Obre el diàleg de cerca Confirm Dialog = Confirma el diàleg Cancel Dialog = Cancel·la el diàleg Upgrade All = Millora-ho tot @@ -5952,8 +5946,7 @@ Sabratha = Sabratha Rusadir = Rusadir Baecula = Baecula Saldae = Saldae - # Requires translation! -Comment [comment] tiles take [] damage] = +Comment [comment] tiles take [] damage] = Comentari: les caselles [comment] reben [] de dany] Theodora = Teodora It is always a shame to destroy a thing of beauty. Happily, you are not one. = Destruir la bellesa sempre és una vergonya. Afortunadament, tu no en tens gens. @@ -6628,40 +6621,22 @@ If you opened the Civilopedia from the main menu, the "Ruleset" will be that of Letters can select categories, and when there are multiple categories matching the same letter, you can press that repeatedly to cycle between these. = Les lletres permeten triar categories i, quan hi ha diferents categories que es corresponen amb la mateixa lletra, podeu prémer diverses vegades la tecla per a moure-vos-hi de manera cíclica. The arrow keys allow navigation as well - left/right for categories, up/down for entries. = Les tecles de cursor també permeten la navegació: esquerra/dreta per a categories i amunt/avall per a desplaçar-se per les diferents entrades. - # Requires translation! -UI Tips = - # Requires translation! -Toggle notification list display = - # Requires translation! -On the World screen, swipe the notification list to the right to temporarily hide it. Click the "Bell" button to display them again. = - # Requires translation! -The default state for the notification list can be set in Options > Display > UI - Notifications on world screen. = - # Requires translation! -Additional controls for the construction queue = - # Requires translation! -Right-click or long press a construction item to open a popup menu with additional controls, allowing to manage production of the same item in all cities, by issuing the commands from the same City screen. = - # Requires translation! -The "Disable" option moves an item to a separated "Disabled" tab, preventing its automatic queueing by the "Auto-assign city production" option. To move a disabled item back to its initial place, enter again the popup menu, and choose "Enable". = - # Requires translation! -Disabled items are set globally and persistent: they are not reset in a new game, or by restarting Unciv. = - # Requires translation! -Queue multiple technologies in different branches = - # Requires translation! -On the Tech screen, right-click or long press a technology to automatically queue it, even if this tech is in another branch than the item currently researched. Prerequisite techs to research will also be automatically queued. = - # Requires translation! -Right-click or long press multiple techs to append them to the research queue, whatever their branch is. = - # Requires translation! -Upgrade multiple units of the same type = - # Requires translation! -On the World screen, select an unit that can be upgraded, then right-click or long press the "Upgrade" button to open a popup menu allowing to upgrade all units of this type at once. = - # Requires translation! -In the Units overview, the same upgrade menu is available by clicking the unit icon in the "Upgrade" column. When an unit is upgradeable, the icon is lit if conditions are met (enough gold and/or resources), otherwise it is dimmed. = - # Requires translation! -Reveal known resources on world screen = - # Requires translation! -In the Resources overview, click on a resource icon to center the world screen on tiles already discovered and providing this resource. = - # Requires translation! -Alternatively, click on the "Unimproved" number to center the world screen only on owned tiles where the resource is not improved. = - # Requires translation! -If more than one tile is available, click repeatedly on the notification to cycle through all of them. = +UI Tips = Consells a la interfície d’usuari +Toggle notification list display = Commuta la vista de la llista de notificacions +On the World screen, swipe the notification list to the right to temporarily hide it. Click the "Bell" button to display them again. = A la vista del món, llisqueu cap a la dreta la llista de notificacions per a amagar-la temporalment. Feu clic al botó de campana per a mostrar-la una altra vegada. +The default state for the notification list can be set in Options > Display > UI - Notifications on world screen. = L’estat per defecte de la llista de notificació es pot establir a Opcions > Vídeo > Interfície gràfica des de la vista del món. +Additional controls for the construction queue = Controls addicionals per a la cua de construcció +Right-click or long press a construction item to open a popup menu with additional controls, allowing to manage production of the same item in all cities, by issuing the commands from the same City screen. = Feu clic amb el botó dret o premeu uns segons un element de construcció per a obrir un menú emergent amb controls addicionals, que permeten gestionar la producció del mateix element en totes les ciutats, aplicant les ordres des de la mateixa vista de ciutat. +The "Disable" option moves an item to a separated "Disabled" tab, preventing its automatic queueing by the "Auto-assign city production" option. To move a disabled item back to its initial place, enter again the popup menu, and choose "Enable". = L’opció de «desactivar» mou un element a una llista separada d’elements desactivats, que evita que s'afegeixin a la cua automàtica de producció autoassignada. Per a moure un element desactivat de nou al seu lloc inicial, entreu al menú emergent i escolliu «Activa». +Disabled items are set globally and persistent: they are not reset in a new game, or by restarting Unciv. = Els elements desactivats s’estableixen de manera global i persistent: no es restableixen en partides noves ni reiniciant l’UnCiv. +Queue multiple technologies in different branches = Posa diferents tecnologies de diferents branques a la cua +On the Tech screen, right-click or long press a technology to automatically queue it, even if this tech is in another branch than the item currently researched. Prerequisite techs to research will also be automatically queued. = A la vista de tecnologies, feu clic amb el botó dret o premeu uns segons una tecnologia per a posar-la a la cua, encara que aquesta tecnologia estigui en una altra branca diferent de l’element que es recerqui en aquell moment. Les tecnologies requerides també s’afegiran a la cua automàticament. +Right-click or long press multiple techs to append them to the research queue, whatever their branch is. = Feu clic amb el botó dret o premeu uns segons diverses tecnologies per a afegir-les a la cua de recerca, sigui quina sigui la branca on es trobin. +Upgrade multiple units of the same type = Millora diverses unitats del mateix tipus +On the World screen, select an unit that can be upgraded, then right-click or long press the "Upgrade" button to open a popup menu allowing to upgrade all units of this type at once. = A la vista del món, trieu una unitat que es pugui millorar, feu clic amb el botó dret o premeu uns segons el botó «Millora» per a obrir un menú emergent que permet millorar totes les unitats del mateix tipus de cop. +In the Units overview, the same upgrade menu is available by clicking the unit icon in the "Upgrade" column. When an unit is upgradeable, the icon is lit if conditions are met (enough gold and/or resources), otherwise it is dimmed. = A la vista d’unitats, hi ha disponible el mateix menú de millora si feu clic a la icona de la unitat a la columna de «Millora». Quan una unitat es pot millorar, la icona es mostra ressaltada si es compleixen les condicions (prou or i/o recursos); altrament, es mostra més opaca. +Reveal known resources on world screen = Revela els recursos coneguts a la vista del món +In the Resources overview, click on a resource icon to center the world screen on tiles already discovered and providing this resource. = A la vista de recursos, feu clic en un recurs per a entrar a la vista del món en caselles descobertes que tinguin el recurs. +Alternatively, click on the "Unimproved" number to center the world screen only on owned tiles where the resource is not improved. = Alternativament, feu clic al nombre «Sense millorar» per a centrar a la vista del món només caselles de dins de la vostra frontera que tinguin el recurs i no estiguin millorades. +If more than one tile is available, click repeatedly on the notification to cycle through all of them. = Si hi ha més d’una casella disponible, feu clic diverses vegades a les notificacions per a recórrer-les totes. diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 8322dbb795..8fc511d1c2 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -2308,8 +2308,8 @@ Triggers the following global alert: [comment] = Déclenche l'alerte générale Every major Civilization gains a spy once a civilization enters this era = Chaque civilisation majeure gagne un espion lorsque qu'une civilisation entre dans cette ère Heal this unit by [positiveAmount] HP = Soigne cette unité de [positiveAmount] PV # Requires translation! -This Unit takes [positiveAmount] damage = -This Unit gains [amount] XP = Cette unité gagne [amount] XP +This Unit takes [positiveAmount] damage = Cette Unité subit [positiveAmount] dégâts +This Unit gains [amount] XP = Cette Unité gagne [amount] XP This Unit upgrades for free including special upgrades = Cette Unité s'améliore gratuitement, améliorations spéciales comprises This Unit gains the [promotion] promotion = Cette Unité gagne la promotion [promotion] Doing so will consume this opportunity to choose a Promotion = Se soigner ainsi remplacera la possibilité actuelle de choisir une Promotion diff --git a/android/assets/jsons/translations/Latin.properties b/android/assets/jsons/translations/Latin.properties index 5d97b77ee5..35ba41a91a 100644 --- a/android/assets/jsons/translations/Latin.properties +++ b/android/assets/jsons/translations/Latin.properties @@ -8053,36 +8053,36 @@ Gunpowder = Pulvis bombardicus # Requires translation! 'The winds and the waves are always on the side of the ablest navigators.' - Edward Gibbon = # Requires translation! -Navigation = +Navigation = Navigatio # Requires translation! 'Compound interest is the most powerful force in the universe.' - Albert Einstein = # Requires translation! -Economics = +Economics = Oeconomia # Requires translation! 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = # Requires translation! -Chemistry = +Chemistry = Chemia # Requires translation! 'There never was a good knife made of bad steel.' - Benjamin Franklin = # Requires translation! -Metallurgy = +Metallurgy = Metallurgia # Requires translation! 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = # Requires translation! -Archaeology = +Archaeology = Archaeologia # Requires translation! 'Every great advance in science has issued from a new audacity of imagination.' - John Dewey = # Requires translation! -Scientific Theory = +Scientific Theory = Theoria scientifica # Requires translation! 'Wars may be fought with weapons, but they are won by men. It is the spirit of the men who follow and of the man who leads that gains the victory.' - George S. Patton = # Requires translation! -Military Science = +Military Science = Scientia Militaris # Requires translation! 'The nation that destroys its soil destroys itself.' - Franklin Delano Roosevelt = # Requires translation! -Fertilizer = +Fertilizer = Laetamen # Requires translation! 'It is well that war is so terrible, or we should grow too fond of it.' - Robert E. Lee = # Requires translation! diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 41ae1793eb..d4bf5b77fb 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -2,13 +2,11 @@ # Equivalent of a space in your language # If your language doesn't use spaces, just add "" as a translation, otherwise " " - # Requires translation! " " = # If the first word in a sentence starts with a capital in your language, # put the english word 'true' behind the '=', otherwise 'false'. # Don't translate these words to your language, only put 'true' or 'false'. - # Requires translation! StartWithCapitalLetter = @@ -17,12 +15,10 @@ StartWithCapitalLetter = # Documentation: https://f-droid.org/en/docs/Build_Metadata_Reference/#Summary # English to translate: https://github.com/yairm210/Unciv/blob/master/fastlane/metadata/android/en-US/short_description.txt - # Requires translation! Fastlane_short_description = # 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 - # Requires translation! Fastlane_full_description = @@ -100,8 +96,7 @@ Can only be purchased = Hanya boleh dibeli See also = Lihat juga Requires at least one of the following: = Memerlukan sekurang-kurangnya satu daripada yang berikut - # Requires translation! -Requires all of the following: = +Requires all of the following: = Memerlukan semua yang berikut: Leads to [techName] = Membawa kepada [techName] Leads to: = Membawa kepada Enables: = Membolehkan @@ -152,8 +147,7 @@ We will remember this. = Kami akan ingat peristiwa ini. [civName] has declared war on [targetCivName]! = [civName] telah mengisytiharkan perang pada [targetCivName]! [civName] and [targetCivName] have signed a Peace Treaty! = [civName] dan [targetCivName] telah menandatangani Perjanjian Damai! - # Requires translation! -Declaration of Friendship = +Declaration of Friendship = Akuan Persahabatan [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] dan [targetCivName] telah menandatangani Pengisytiharan Persahabatan! [civName] has denounced [targetCivName]! = [civName] telah mengecam [targetCivName]! Do you want to break your promise to [leaderName]? = Adakah anda ingin memungkirkan janji anda kepada [leaderName]? @@ -242,8 +236,7 @@ Irrational = Tidak rational Personality = Personaliti Influence = Pengaruhan - # Requires translation! -Ally: [civilization] with [amount] Influence = +Ally: [civilization] with [amount] Influence = Sekutu: [civilization] dengan [amount] Pengaruh Unknown civilization = Tamadun tidak diketahui Reach 30 for friendship. = Capai 30 untuk persahabatan. Reach highest influence above 60 for alliance. = Capai pengaruhan tertinggi melebihi 60 untuk pakatan @@ -338,7 +331,7 @@ Max Turns = Pusingan Maksimum Could not load map! = Tidak dapat memuatkan peta! Generated = Dihasilkan Random Generated = Dihasilkan secara rawak -Which options should be available to the random selection? = Pilihan yang manakah harus tersedia untuk pemilihan rawak? # Requires translation! +Which options should be available to the random selection? = Pilihan yang manakah harus tersedia untuk pemilihan rawak? Existing = Yang sedia ada Custom = Dibuat khas Map Generation Type = Jenis Penghasilan Peta @@ -351,8 +344,7 @@ Three Continents = Tiga Benua Four Corners = Empat Penjuru Archipelago = Kepulauan Inner Sea = Lautan Dalam - # Requires translation! -Perlin = +Perlin = Perlin Random number of Civilizations = Bilangan rawak Tamadun Min number of Civilizations = Bilangan minimum Tamadun Max number of Civilizations = Bilangan maksimum Tamadun @@ -362,9 +354,9 @@ Max number of City-States = Bilangan maksimum Negara Kota One City Challenge = Cabaran Bandar Tunggal Enable Nuclear Weapons = Membolehkan Senjata Nuklear No City Razing = Tiada Hancuran Bandar -No Barbarians = Tiada Orang Barbar +No Barbarians = Tiada Orang Gasar Disable starting bias = Melumpuhkan permulaan berat sebelah -Raging Barbarians = Orang Barbar Mengamuk +Raging Barbarians = Orang Gasar Mengamuk No Ancient Ruins = Tiada Runtuhan Purba No Natural Wonders = Tiada Keajaiban Dunia Allow anyone to spectate = Membenarkan sesiapa untuk tonton @@ -388,8 +380,7 @@ Rectangular = Segi Empat Tepat Height = Ketinggian Width = Kelebaran Radius = Jejari - # Requires translation! -Enable Espionage = +Enable Espionage = Membolehkan pengitipan Resource Setting = Tetapan Sumber Enabled Resource Settings = Tetapan Sumber yang Dibolehkan @@ -450,35 +441,22 @@ Starting Era = Era Permulaan It looks like we can't make a map with the parameters you requested! = Nampaknya kita tidak dapat menghasilkan peta mengikuti parameter yang diberikan! Maybe you put too many players into too small a map? = Mungkin anda memberikan terlalu banyak pemain dalam peta yang terlalu kecil? No human players selected! = Tiada pemain manusia terpilih! - # Requires translation! -Invalid Player ID! = - # Requires translation! -No victory conditions were selected! = +Invalid Player ID! = ID Pemain Tidak Sah! +No victory conditions were selected! = Tiada syarat kemenangan dipilih! Mods: = Mod: Extension mods = Mod tambahan - # Requires translation! -Base ruleset: = +Base ruleset: = Set Peraturan Asas # Note - do not translate the colour names between «». Changing them works if you know what you're doing. - # Requires translation! -The mod you selected is incorrectly defined! = - # Requires translation! -The mod you selected is «RED»incorrectly defined!«» = - # Requires translation! -The mod combination you selected is incorrectly defined! = - # Requires translation! -The mod combination you selected is «RED»incorrectly defined!«» = - # Requires translation! -The mod combination you selected has problems. = - # Requires translation! -You can play it, but don't expect everything to work! = - # Requires translation! -The mod combination you selected «GOLD»has problems«». = - # Requires translation! -You can play it, but «GOLDENROD»don't expect everything to work!«» = - # Requires translation! -This base ruleset is not compatible with the previously selected\nextension mods. They have been disabled. = - # Requires translation! -Are you really sure you want to play with the following known problems? = +The mod you selected is incorrectly defined! = Mod yang anda pilih tidak ditakrifkan dengan betul! +The mod you selected is «RED»incorrectly defined!«» = Mod yang anda pilih ialah «RED»ditakrifkan dengan salah!«» +The mod combination you selected is incorrectly defined! = Gabungan mod yang anda pilih tidak ditakrifkan dengan betul! +The mod combination you selected is «RED»incorrectly defined!«» = Gabungan mod yang anda pilih ialah «RED»ditakrifkan secara salah!«» +The mod combination you selected has problems. = Gabungan mod yang anda pilih mempunyai masalah. +You can play it, but don't expect everything to work! = Anda boleh memainkannya, tetapi jangan harap semuanya berfungsi! +The mod combination you selected «GOLD»has problems«». = Gabungan mod yang anda pilih «GOLD»mempunyai masalah«». +You can play it, but «GOLDENROD»don't expect everything to work!«» = Anda boleh memainkannya, tetapi «GOLDENROD»jangan harap semuanya berfungsi!«» +This base ruleset is not compatible with the previously selected\nextension mods. They have been disabled. = Set peraturan asas ini tidak serasi dengan mod pilihan\sambungan yang dipilih sebelum ini. Mereka telah cacat. +Are you really sure you want to play with the following known problems? = Adakah anda benar-benar pasti mahu bermain dengan masalah yang diketahui berikut? Base Ruleset = Peraturan Asas [amount] Techs = [amount] Teknologi [amount] Nations = [amount] Bangsa @@ -498,20 +476,13 @@ Anything above 40 may work very slowly on Android! = Apa-apa di atas 40 boleh me ## Tabs/Buttons Map editor = Editor peta - # Requires translation! -View = - # Requires translation! -Generate = - # Requires translation! -Partial = - # Requires translation! -Generator steps = - # Requires translation! -Edit = - # Requires translation! -Rivers = - # Requires translation! -Load = +View = Permandangan +Generate = Menjana +Partial = Separa +Generator steps = Langkah penjana +Edit = Edit +Rivers = Sungai +Load = Memuatkan Save = Simpan New map = Peta baru Empty = Kosong @@ -519,35 +490,21 @@ Save map = Simpan peta Load map = Muatkan peta Delete map = Padam peta Are you sure you want to delete this map? = Adakah anda panti ingin memadamkan peta ini? - # Requires translation! -It looks like your map can't be saved! = +It looks like your map can't be saved! = Nampaknya peta anda tidak dapat disimpan! Exit map editor = Keluar editor peta - # Requires translation! -Change map ruleset = - # Requires translation! -Change the map to use the ruleset selected on this page = - # Requires translation! -Revert to map ruleset = - # Requires translation! -Reset the controls to reflect the current map ruleset = - # Requires translation! -Features = - # Requires translation! -Starting locations = - # Requires translation! -Tile Matching Criteria = - # Requires translation! -Complete match = - # Requires translation! -Except improvements = - # Requires translation! -Base and terrain features = - # Requires translation! -Base terrain only = - # Requires translation! -Land or water only = - # Requires translation! -Import a Wesnoth map = +Change map ruleset = Tukar set peraturan peta +Change the map to use the ruleset selected on this page = Tukar peta untuk menggunakan set peraturan yang dipilih pada halaman ini +Revert to map ruleset = Kembalikan peta kepada set peraturan +Reset the controls to reflect the current map ruleset = Tetapkan semula kawalan untuk mencerminkan set peraturan peta semasa +Features = Ciri-ciri +Starting locations = Lokasi permulaan +Tile Matching Criteria = Kriteria Padanan Jubin +Complete match = Padanan lengkap +Except improvements = Kecuali Penambahbaikan +Base and terrain features = Ciri asas dan rupa bumi +Base terrain only = Bentuk muka bumi sahaja +Land or water only = Tanah atau air sahaja +Import a Wesnoth map = Import peta Wesnoth ## Labels/messages # Requires translation! @@ -1239,14 +1196,14 @@ Your [ourUnit] captured an enemy [theirUnit]! = [ourUnit] anda telah menangkap [ # Requires translation! Your captured [unitName] has been returned by [civName] = Your [ourUnit] plundered [amount] [Stat] from [theirUnit] = [ourUnit] anda telah menjalah [amount] [Stat] daripada [theirUnit] -We have captured a barbarian encampment and recovered [goldAmount] gold! = Kami telah menangkapkan sebuah kem barbar dan memulihkan [goldAmount] emas! +We have captured a barbarian encampment and recovered [goldAmount] gold! = Kami telah menangkapkan sebuah kem Orang Gasar dan memulihkan [goldAmount] emas! # Requires translation! An enemy [unitType] has joined us! = # Requires translation! [unitName] can be promoted! = # This might be needed for a rewrite of Germany's unique - see #7376 -A barbarian [unitType] has joined us! = Sebuah [unitType] barbar telah menyertai kami! +A barbarian [unitType] has joined us! = Sebuah [unitType] Orang Gasar telah menyertai kami! We have found survivors in the ruins - population added to [cityName] = Kami terjumpa mangsa yang selamat di runtuhan purba - populasi ditambahkan di [cityName] We have discovered the lost technology of [techName] in the ruins! = Kami terjumpa teknologi [techName] yang telah hilang di runtuhan purba! @@ -1284,7 +1241,7 @@ We have discovered [naturalWonder]! = Kami terjumpa [naturalWonder]! We have received [goldAmount] Gold for discovering [naturalWonder] = Kami menerima [goldAmount] Emas sebab terjumpa [naturalWonder] Your relationship with [cityStateName] is about to degrade = Hubungan kami dengan [cityStateName] hampir rosot Your relationship with [cityStateName] degraded = Hubungan kami dengan [cityStateName] telah rosot -A new barbarian encampment has spawned! = Sebuah kem barbar baru terbentuk! +A new barbarian encampment has spawned! = Sebuah kem Orang Gasar baru terbentuk! # Requires translation! Barbarians raided [cityName] and stole [amount] Gold from your treasury! = Received [goldAmount] Gold for capturing [cityName] = Terima [goldAmount] Emas sebab menawankan [cityName] @@ -2082,7 +2039,7 @@ Unit cost modifier = Pengubah kos unit Building cost modifier = Pengubah kos bangunan Policy cost modifier = Pengubah kos polisi Unhappiness modifier = Pengubah ketidakgembiraan -Bonus vs. Barbarians = Bonus terhadap Orang Barbar +Bonus vs. Barbarians = Tambahan vs. Orang Gasar # Requires translation! Barbarian spawning delay = # Requires translation! @@ -2102,8 +2059,8 @@ AI free techs = Major AI civilization bonus starting units = # Requires translation! City state bonus starting units = -Turns until barbarians enter player tiles = Giliran hingga orang barbar memasuki jubin pemain -Gold reward for clearing barbarian camps = Gajaran emas menghapuskan kem barbar +Turns until barbarians enter player tiles = Giliran hingga orang Gasar memasuki jubin pemain +Gold reward for clearing barbarian camps = Gajaran emas menghapuskan kem Orang Gasar # Other civilopedia things @@ -3440,10 +3397,9 @@ Cannot be used as permanent audiovisual mod = ######### Map Unit Filters ########### Wounded = Tercedera -Barbarians = Orang barbar -Barbarian = Orang Barbar - # Requires translation! -City-State = +Barbarians = Orang Gasar +Barbarian = Orang Gasar +City-State = Negara Kota Embarked = Mulakan # Requires translation! Non-City = diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 0a8945e115..4598e0fe72 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -2309,7 +2309,7 @@ Triggers the following global alert: [comment] = Inicjujesz następujący alert Every major Civilization gains a spy once a civilization enters this era = Każda cywilizacja zdobywa szpiega gdy wkroczy w tą erę Heal this unit by [positiveAmount] HP = Jednostka odzyskuje +[positiveAmount] PŻ # Requires translation! -This Unit takes [positiveAmount] damage = +This Unit takes [positiveAmount] damage = Ta jednostka otrzymuje [positiveAmount] obrażeń This Unit gains [amount] XP = Ta jednostka otrzymuje [amount] PD This Unit upgrades for free including special upgrades = Ta jednostka ulepszana jest za darmo (w tym ulepszania specjalne) This Unit gains the [promotion] promotion = Ta jednostka uzyskała awans [promotion] diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index b084a9fe7f..5d87d32f12 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -4,8 +4,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.8.21" const val appName = "Unciv" - const val appCodeNumber = 944 - const val appVersion = "4.9.9" + const val appCodeNumber = 945 + const val appVersion = "4.9.10" const val gdxVersion = "1.12.1" const val ktorVersion = "2.2.3" diff --git a/changelog.md b/changelog.md index eb979a60f6..716a8f3ca2 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,25 @@ +## 4.9.10 + +Add the remove unit promotion unique - By PLynx01 + +Fix key bindings all reset to unbound on entering options and leaving without looking at the keys page - By SomeTroglodyte + +By remdu: +- Coast spread algorithm +- avoid initializing with terrain that shouldn't be naturally generated + +Stop on Path Blocked - By itanasi + +Units that can't build roads should not have connect roads automation. - By willjallen + +By SeventhM: +- Fix Great Scientist science calculation +- Show stat percent differences in replacement building differences + +By dHannasch: +- Add BaseUnit.automaticallyUpgradedInProductionToUnitByTech() +- Don't list Unique requiring a tech in the Civilopedia for that tech + ## 4.9.9 Finally deprecated old religion uniques diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index ead7e9c159..a9b5d4301d 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -464,7 +464,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.9.9", 944) + val VERSION = Version("4.9.10", 945) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/945.txt b/fastlane/metadata/android/en-US/changelogs/945.txt new file mode 100644 index 0000000000..f961fcfde1 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/945.txt @@ -0,0 +1,21 @@ + + +Add the remove unit promotion unique - By PLynx01 + +Fix key bindings all reset to unbound on entering options and leaving without looking at the keys page - By SomeTroglodyte + +By remdu: +- Coast spread algorithm +- avoid initializing with terrain that shouldn't be naturally generated + +Stop on Path Blocked - By itanasi + +Units that can't build roads should not have connect roads automation. - By willjallen + +By SeventhM: +- Fix Great Scientist science calculation +- Show stat percent differences in replacement building differences + +By dHannasch: +- Add BaseUnit.automaticallyUpgradedInProductionToUnitByTech() +- Don't list Unique requiring a tech in the Civilopedia for that tech \ No newline at end of file