From 10cb51795c35690ccf745205c26e06a373718e0e Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 20 Nov 2023 22:52:44 +0200 Subject: [PATCH] Version rollout (#10530) * Bump version and create initial changelog entry * Update Brazilian_Portuguese.properties (#10528) * Update French.properties (#10524) * Update Italian.properties (#10522) * Update Polish.properties (#10521) * Update Polish.properties * Added Fastlane_short_description * Update Malay.properties (#10520) Translated line 33 to line 325. Not at all finished. This time though I didn't mess up. --------- Co-authored-by: yairm210 Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com> Co-authored-by: Ouaz Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com> Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com> Co-authored-by: Mikhail <151419244+MetaFBMI@users.noreply.github.com> --- .../Brazilian_Portuguese.properties | 18 +- .../jsons/translations/French.properties | 20 +- .../jsons/translations/Italian.properties | 18 +- .../jsons/translations/Malay.properties | 272 ++++++------------ .../jsons/translations/Polish.properties | 14 +- buildSrc/src/main/kotlin/BuildConfig.kt | 4 +- changelog.md | 40 +++ core/src/com/unciv/UncivGame.kt | 2 +- .../metadata/android/en-US/changelogs/930.txt | 39 +++ 9 files changed, 203 insertions(+), 224 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/930.txt diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index f8cbfd50f4..c18b4a7f0e 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -812,10 +812,8 @@ Screen orientation = Orientação da tela Landscape (fixed) = Paisagem (fixo) Portrait (fixed) = Retrato (fixo) Auto (sensor adjusted) = Automático (sensor ajustado) - # Requires translation! -Enable using display cutout areas = - # Requires translation! -Hide system status and navigation bars = +Enable using display cutout areas = Ativar o uso de áreas de recorte de exibição +Hide system status and navigation bars = Ocultar o status do sistema e as barras de navegação Font family = Família da fonte Font size multiplier = Multiplicador de tamanho de fonte Default Font = Fonte padrão @@ -1550,8 +1548,7 @@ Resource [resource] does not exist in ruleset! = Recurso [resource] não está d Improvement [improvement] does not exist in ruleset! = Melhoria [improvement] não existe no conjunto de regras! Nation [nation] does not exist in ruleset! = Nação [nation] não existe no conjunto de regras! Natural Wonder [naturalWonder] does not exist in ruleset! = Maravilha Natural [naturalWonder] não existe no conjunto de regras! - # Requires translation! -non-[filter] = +non-[filter] = não-[filter] # Civilopedia difficulty levels Player settings = Configurações do jogador @@ -2072,8 +2069,7 @@ Can transform to [unit] = Pode se transformar em [unit] [amount] Movement = [amount] de Movimento [amount] Sight = [amount] de Visão [amount] Range = [amount] de Alcance - # Requires translation! -[relativeAmount] Air Interception Range = +[relativeAmount] Air Interception Range = [relativeAmount] de Alcance de interceptação aérea [amount] HP when healing = [amount] HP ao curar [relativeAmount]% Spread Religion Strength = [relativeAmount]% da força da religião de propagação When spreading religion to a city, gain [amount] times the amount of followers of other religions as [stat] = Ao espalhar religião para uma cidade, ganhe [amount] vezes a quantidade de seguidores de outras religiões como [stat] @@ -2645,8 +2641,7 @@ Mint = Casa da moeda Aqueduct = Aqueduto Heroic Epic = Épica Heróica - # Requires translation! -All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = +All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = Todas as unidades [baseUnitFilter]] recém-treinadas [cityFilter] recebem a promoção [promotion] Colossus = Colossos 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'Ora, homem, ele supera o mundo estreito como um colosso, e nós, homens mesquinhos andamos embaixo das suas grandes pernas, e espiamos para encontrar-nos túmulos desonrosos.' - William Shakespeare, Júlio César @@ -3411,8 +3406,7 @@ Yamaguchi = Yamaguchi Ota = Ota Tottori = Tottori Japan = Japão - # Requires translation! -for [mapUnitFilter]] units = +for [mapUnitFilter]] units = para unidades [mapUnitFilter]] Gandhi = Gandhi I have just received a report that large numbers of my troops have crossed your borders. = Eu acabei de recerber um informe de que um grande número de minhas tropas cruzaram suas fronteiras. diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 41c4c23d64..c75df8274b 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -813,9 +813,9 @@ Landscape (fixed) = Paysage (fixe) Portrait (fixed) = Portrait (fixe) Auto (sensor adjusted) = Auto (capteurs) # Requires translation! -Enable using display cutout areas = +Enable using display cutout areas = Activer l'affichage de la zone d'encoche d'écran # Requires translation! -Hide system status and navigation bars = +Hide system status and navigation bars = Cacher le statut système et les barres de navigation Font family = Famille de police Font size multiplier = Multiplicateur de taille de police Default Font = Police par défaut @@ -1551,7 +1551,7 @@ Improvement [improvement] does not exist in ruleset! = L'aménagement [improveme Nation [nation] does not exist in ruleset! = La nation [nation] n'existe pas dans ces règles ! Natural Wonder [naturalWonder] does not exist in ruleset! = La merveille naturelle [naturalWonder] n'existe pas dans ces règles ! # Requires translation! -non-[filter] = +non-[filter] = non-[filter] # Civilopedia difficulty levels Player settings = Paramètres du joueur @@ -1921,7 +1921,7 @@ Allied City-States will occasionally gift Great People = Les Cités-États alli Will not be chosen for new games = Ne sera pas choisi pour une nouvelle partie [relativeAmount]% City-State Influence degradation = [relativeAmount]% de dégradation d'Influence sur les Cités-États Resting point for Influence with City-States is increased by [amount] = Le point d'équilibre de l'Influence sur les Cités-États augmente de [amount] -Allied City-States provide [stat] equal to [relativeAmount]% of what they produce for themselves = Les Cités-États alliées offrent un bonus [stat] égal à [relativeAmount]% de ce qu'elles produisent pour elles-mêmes. +Allied City-States provide [stat] equal to [relativeAmount]% of what they produce for themselves = Les Cités-États alliées offrent un bonus [stat] égal à [relativeAmount]% de ce qu'elles produisent pour elles-mêmes [relativeAmount]% resources gifted by City-States = [relativeAmount]% ressources offertes par les Cités-États [relativeAmount]% Happiness from luxury resources gifted by City-States = [relativeAmount]% Bonheur pour les ressources de luxe offertes par les Cités-États City-State Influence recovers at twice the normal rate = L'influence sur les Cités-États remonte deux fois plus vite que la normale @@ -2073,7 +2073,7 @@ Can transform to [unit] = Transformable en [unit] [amount] Sight = [amount] Vision [amount] Range = [amount] Portée # Requires translation! -[relativeAmount] Air Interception Range = +[relativeAmount] Air Interception Range = [relativeAmount] Portée Interception Aérienne [amount] HP when healing = [amount] PV en phase de soin [relativeAmount]% Spread Religion Strength = [relativeAmount]% Puissance de Diffusion de la Religion When spreading religion to a city, gain [amount] times the amount of followers of other religions as [stat] = En diffusant la religion dans une ville, recevoir [amount] fois le nombre des fidèles d'autres religions en [stat] @@ -2646,7 +2646,7 @@ Aqueduct = Aqueduc Heroic Epic = Épopée Héroïque # Requires translation! -All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = +All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = Toutes les unités [baseUnitFilter]] nouvellement formées [cityFilter] reçoivent la promotion [promotion] Colossus = Colosse 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'Eh ! Ami, il enjambe cet étroit univers comme un colosse, et nous autres, hommes chétifs, nous passons sous ses jambes énormes et nous furetons partout pour trouver des tombes déshonorées.' - William Shakespeare, Julius Caesar @@ -3412,7 +3412,7 @@ Ota = Ota Tottori = Tottori Japan = Japon # Requires translation! -for [mapUnitFilter]] units = +for [mapUnitFilter]] units = pour les unités [mapUnitFilter]] Gandhi = Gandhi I have just received a report that large numbers of my troops have crossed your borders. = On vient de me rapporter que mes troupes ont franchi vos frontières en grand nombre. @@ -4563,7 +4563,7 @@ Tundra = Toundra Desert = Désert Lakes = Lacs -Lakes provide fresh water to adjacent tiles, allowing farming where it would otherwise not be possible (similar to Rivers and Oases). = Les lacs fournissent de l'eau douce aux cases adjacentes, permettant d'aménager des fermes sur les cases où cela est impossible par défaut (effet semblable aux Rivières et Oasis). +Lakes provide fresh water to adjacent tiles, allowing farming where it would otherwise not be possible (similar to Rivers and Oases). = Les lacs fournissent de l'eau douce aux cases adjacentes, permettant d'aménager des fermes sur les cases où cela est normalement impossible (effet semblable aux Rivières et Oasis). Oasis = Oasis Farm = Ferme @@ -4583,7 +4583,7 @@ Only Polders can be built here = Seuls des Polders peuvent être construits ici Fallout = Retombées radioactives -Oases provide fresh water to adjacent tiles, allowing farming where it would otherwise not be possible (similar to Rivers and Lakes). = Les oasis fournissent de l'eau douce aux cases adjacentes, permettant d'aménager des fermes sur les cases où cela est impossible par défaut (effet semblable aux Rivières et Lacs). +Oases provide fresh water to adjacent tiles, allowing farming where it would otherwise not be possible (similar to Rivers and Lakes). = Les oasis fournissent de l'eau douce aux cases adjacentes, permettant d'aménager des fermes sur les cases où cela est normalement impossible (effet semblable aux Rivières et Lacs). Flood plains = Plaines inondables @@ -4593,7 +4593,7 @@ Atoll = Atoll Rivers exist on tile edges, not as terrain feature per se. = Les rivières se trouvent sur les bords des cases, et ne constituent pas un type de terrain en tant que tel. Tiles on both sides gain its benefits. These benefits do not stack. = Les cases situées de part et d'autre d'une rivière reçoivent ses bénéfices. Ces derniers ne s'additionnent pas. -The tile has access to fresh water, allowing farming where it would otherwise not be possible (similar to Oases and Lakes). = Les cases ont accès à de l'eau douce, permettant ainsi d'aménager des fermes où cela est impossible par défaut (effet semblable aux Oasis et Lacs). +The tile has access to fresh water, allowing farming where it would otherwise not be possible (similar to Oases and Lakes). = Les cases ont accès à de l'eau douce, permettant ainsi d'aménager des fermes où cela est normalement impossible (effet semblable aux Oasis et Lacs). Movement across rivers takes all remaining movement points of a unit unless there is a bridge. = Un déplacement par-delà une rivière consomme tous les points de mouvement restants d'une unité, à moins de passer par un pont. When attacking across a river, the attacker gets a -20% strength malus. = En attaquant par-delà une rivière, l'unité offensive subit une pénalité de puissance de -20%. Road = Route diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index f5fb0f6cff..6f07ad06fb 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -812,10 +812,8 @@ Screen orientation = Orientamento schermo Landscape (fixed) = Panorama (fisso) Portrait (fixed) = Ritratto (fisso) Auto (sensor adjusted) = Automatico (sensori sistemati) - # Requires translation! -Enable using display cutout areas = - # Requires translation! -Hide system status and navigation bars = +Enable using display cutout areas = Abilita utilizzo delle aree ritaglio del display +Hide system status and navigation bars = Nascondi status sistema e barre di navigazione Font family = Tipo font Font size multiplier = Grandezza font Default Font = Font default @@ -1550,8 +1548,7 @@ Resource [resource] does not exist in ruleset! = Risorsa [resource] non esiste n Improvement [improvement] does not exist in ruleset! = Miglioramento [improvement] non esiste nel ruleset! Nation [nation] does not exist in ruleset! = La civiltà [nation] non esiste nel ruleset! Natural Wonder [naturalWonder] does not exist in ruleset! = La Meraviglia Naturale [naturalWonder] non esiste nel ruleset! - # Requires translation! -non-[filter] = +non-[filter] = non-[filter] # Civilopedia difficulty levels Player settings = Impostazioni giocatore @@ -2072,8 +2069,7 @@ Can transform to [unit] = Può trasformarsi in [unit] [amount] Movement = [amount] Movimento [amount] Sight = [amount] Visione [amount] Range = [amount] Raggio - # Requires translation! -[relativeAmount] Air Interception Range = +[relativeAmount] Air Interception Range = [relativeAmount] Raggio intercettazione aerea [amount] HP when healing = [amount] Salute quando guarisce [relativeAmount]% Spread Religion Strength = [relativeAmount]% Forza di diffusione religiosa When spreading religion to a city, gain [amount] times the amount of followers of other religions as [stat] = Quando diffondi una religione a una città, ottieni [amount] volte la quantità di seguaci delle altre religioni pari a [stat] @@ -2646,8 +2642,7 @@ Mint = Zecca Aqueduct = Acquedotto Heroic Epic = Poema eroico - # Requires translation! -All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = +All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = Tutte le unità [baseUnitFilter]] addestrate [cityFilter] ricevono la promozione [promotion] Colossus = Colosso 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'Già, lui cavalca questo stretto mondo ormai come un colosso; e noi, gli omuncoli, passiamo sotto le sue gambe enormi e ci scrutiamo intorno, per ritrovarci tutti quanti siamo come tanti sepolcri senza onore' - William Shakespeare: Giulio Cesare @@ -3412,8 +3407,7 @@ Yamaguchi = Yamaguchi Ota = Ota Tottori = Tottori Japan = Giappone - # Requires translation! -for [mapUnitFilter]] units = +for [mapUnitFilter]] units = per le unità [mapUnitFilter]] Gandhi = Gandhi I have just received a report that large numbers of my troops have crossed your borders. = Posso dichiarare guerra senza sacrificare morali! Non chiedermi come: non capiresti. diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index e3ca2138d8..e01873a907 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -30,14 +30,11 @@ Fastlane_full_description = # https://yairm210.github.io/Unciv/Other/Translating/ # General - # Requires translation! -Delete = +Delete = Padam # Base ruleset names - # Requires translation! -Civ V - Vanilla = - # Requires translation! -Civ V - Gods & Kings = +Civ V - Vanilla = Civ V - Vanila +Civ V - Gods & Kings = Civ V - Dewa & Raja # Tutorial tasks @@ -51,37 +48,28 @@ Reassign worked tiles!\nEnter city screen > click the assigned (green) tile to u Meet another civilization!\nExplore the map until you encounter another civilization! = Temui tamadun yang lain! \nTeroka peta sehingga anda menemui tamadun lain! Open the options table!\nClick the menu button (top left) > click 'Options' = Buka menu tetapan! \nKlik butang menu (kiri atas) > klik 'Tetapan' 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 = Bina peningkatan! \nBina unit pekerja > Pindah ke jubin Dataran atau Padang Rumput > \nKlik 'Buat peningkatan' (di atas tetapan pilihan unit, kiri bawah)\n > Pilih ladang > \n Biarkan pekerja di sana sehingga selesai -Create a trade route!\nConstruct roads between your capital and another city\nOr, automate your worker and let him get to that eventually = Buat laluan perdagangan! \nBina jalan antara ibu kota anda dan bandar lain\nAtau, automasikan pekerja anda dan biarkan dia buat demikian akhirnya +Create a trade route!\nConstruct roads between your capital and another city\nOr, automate your worker and let him get to that eventually = Buat laluan perdagangan! \nBina jalan antara negara kota anda dan bandar lain\nAtau, automasikan pekerja anda dan biarkan dia buat demikian akhirnya Conquer a city!\nBring an enemy city down to low health > \nEnter the city with a melee unit = Taklukkan bandar! \nSerang bandar musuh ke tahap kesihatan yang rendah > \nMasuk ke bandar dengan unit tempur jarak dekat Move an air unit!\nSelect an air unit > select another city within range > \nMove the unit to the other city = Pindahkan unit udara! \nPilih unit udara > pilih bandar lain dalam sasaran berdekatan > \nPindahkan unit ke bandar lain See your stats breakdown!\nEnter the Overview screen (top right corner) >\nClick on 'Stats' = Lihat perincian statistik anda! \nMasuk ke skrin Gambaran Keseluruhan (sudut kanan atas) > \nKlik pada 'Stat' # Crash screen - # Requires translation! -An unrecoverable error has occurred in Unciv: = - # Requires translation! -If this keeps happening, you can try disabling mods. = - # Requires translation! -You can also report this on the issue tracker. = - # Requires translation! -Copy = - # Requires translation! -Error report copied. = - # Requires translation! -Open Issue Tracker = - # Requires translation! -Please copy the error report first. = - # Requires translation! -Close Unciv = +An unrecoverable error has occurred in Unciv: = Ralat yang tidak dapat dipulihkan telah berlaku dalam Unciv: +If this keeps happening, you can try disabling mods. = Jika masih berlaku, anda boleh cuba melumpuhkan mod. +You can also report this on the issue tracker. = Anda juga boleh melaporkan perkara ini pada penjejak isu. +Copy = Salinan +Error report copied. = Laporan ralat disalin. +Open Issue Tracker = Buka penjejak isu +Please copy the error report first. = Tolong salin laporan ralat dahulu. +Close Unciv = Tutup Unciv # Buildings Unsellable = Tidak terjual Not displayed as an available construction unless [building] is built = Tidak dipaparkan sebagai pembinaan yang ada melainkan [building] sudah dibina Not displayed as an available construction without [resource] = Tidak dipaparkan sebagai pembinaan yang ada tampa [resource] - # Requires translation! -Cannot be hurried = +Cannot be hurried = Tidak boleh dilajukan Choose a free great person = Pilih seorang wira bebas Get [unitName] = Dapatkan [unitName] @@ -99,15 +87,12 @@ Requires at least one of the following resources worked near the city: = Memerlu Wonder is being built elsewhere = Keajaiban sedang dibina di tempat lain National Wonder is being built elsewhere = Keajaiban Kebangsaan sedang dibina di tempat lain Requires a [buildingName] in all cities = Memerlukan [buildingName] di semua bandar - # Requires translation! -[buildingName] required: = +[buildingName] required: = [buildingName] diperlukan: Requires a [buildingName] in this city = Memerlukan [buildingName] di bandar ini Cannot be built with [buildingName] = Tidak boleh dibina dengan [buildingName] Consumes [amount] [resource] = Menggunakan [amount] [resource] - # Requires translation! -Need [amount] more [resource] = - # Requires translation! -[amount] available = +Need [amount] more [resource] = Perlu [amount] lagi [resource] +[amount] available = [amount] tersedia Required tech: [requiredTech] = Teknologi yang diperlukan: [requiredTech] Requires [PolicyOrNationalWonder] = Memerlukan [PolicyOrNationalWonder] Cannot be purchased = Tidak boleh dibeli @@ -115,13 +100,11 @@ 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 all of the following: = Memerlukan semua yang berikut + all of the following: = Memerlukan semua yang berikut Leads to [techName] = Membawa kepada [techName] Leads to: = Membawa kepada - # Requires translation! -Enables: = - # Requires translation! -Disables: = +Enables: = Membolehkan +Disables: = Tidak membolehkan Current construction = Pembinaan semasa Construction queue = Aturan pembinaan @@ -131,8 +114,7 @@ Add to queue = Tambah pada aturan Remove from queue = Buang daripada aturan Show stats drilldown = Tunjukkan paparan statistik Show construction queue = Tunjuk aturan pembinaan - # Requires translation! -No space to place this unit = +No space to place this unit = Tiada ruang untuk meletakkan unit Cancel = Batal Diplomacy = Diplomasi @@ -141,14 +123,10 @@ Peace = Keamanan Research Agreement = Perjanjian Penyelidikan Declare war = Isytiharkan perang Declare war on [civName]? = Isytiharkan perang keatas [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] = - # Requires translation! -Go to on map = +[civName] will also join them in the war = [civName] juga akan menyertai mereka dalam peperangan +An unknown civilization will also join them in the war = Tamadun yang tidak diketahui juga akan menyertai mereka dalam peperangan +This will cancel your defensive pact with [civName] = Ini akan membatalkan pakatan pertahanan dengan [civName] +Go to on map = Pergi kepada peta Let's begin! = Mari kita mulakan! [civName] has declared war on us! = [civName] telah mengisytiharkan perang pada kami [leaderName] of [nation] = [leaderName] dari [nation] @@ -176,23 +154,17 @@ We will remember this. = Kami akan ingat peristiwa ini. [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]? - # Requires translation! -Break promise = +Break promise = Ingkar janji We promised not to settle near them ([count] turns remaining) = Kami berjanji tidak akan tetap berhampiran mereka (baki [count] giliran) They promised not to settle near us ([count] turns remaining) = Mereka berjanji tidak akan tetap berhampiran kami (baki [count] giliran) - # Requires translation! -[civName] is upset that you demanded tribute from [cityState], whom they have pledged to protect! = - # Requires translation! -[civName] is upset that you attacked [cityState], whom they have pledged to protect! = - # Requires translation! -[civName] is outraged that you destroyed [cityState], whom they had pledged to protect! = - # Requires translation! -[civName] has destroyed [cityState], whom you had pledged to protect! = +[civName] is upset that you demanded tribute from [cityState], whom they have pledged to protect! = [civName] kecewa kerana anda menuntut penghormatan daripada [cityState], yang mereka telah berjanji untuk melindungi! +[civName] is upset that you attacked [cityState], whom they have pledged to protect! = [civName] kecewa kerana anda serang [cityState], yang mereka telah berjanji untuk melindungi! +[civName] is outraged that you destroyed [cityState], whom they had pledged to protect! = [civName] geram kerana anda memusnahkan [cityState], yang mereka telah berjanji untuk melindungi! +[civName] has destroyed [cityState], whom you had pledged to protect! = [civName] telah memusnahkan [cityState], yang anda telah berjanji untuk melindungi! Unforgivable = Tidak dapat dimaafkan - # Requires translation! -Afraid = +Afraid = Takut Enemy = Musuh Competitor = Pesaingan Neutral = Berkecuali @@ -202,32 +174,23 @@ Ally = Pakatan [questName] (+[influenceAmount] influence) = [questName] (+[influenceAmount] pengaruhan) [remainingTurns] turns remaining = Baki [remainingTurns] giliran - # Requires translation! -Current leader is [civInfo] with [amount] [stat] generated. = - # Requires translation! -Current leader is [civInfo] with [amount] Technologies discovered. = +Current leader is [civInfo] with [amount] [stat] generated. = Pemimpin semasa ialah [civInfo] dengan [amount] [stat] dihasilkan. +Current leader is [civInfo] with [amount] Technologies discovered. = Pemimpin semasa ialah [civInfo] dengan [amount] Teknology ditemui. Demands = Permintaan Please don't settle new cities near us. = Tolong jangan menetap berdekatan bandar kami Very well, we shall look for new lands to settle. = Baiklah, kami akan menerokai tanah baru untuk ditetapkan. We shall do as we please. = Kami buat sesuka hati kami. We noticed your new city near our borders, despite your promise. This will have....implications. = Kami perhatikan bandar baru kamu berhampiran dengan sempadan kami walaupun janji kami. Tindakan kamu ada....implikasi. - # Requires translation! -I've been informed that my armies have taken tribute from [civName], a city-state under your protection.\nI assure you, this was quite unintentional, and I hope that this does not serve to drive us apart. = - # Requires translation! -We asked [civName] for a tribute recently and they gave in.\nYou promised to protect them from such things, but we both know you cannot back that up. = - # Requires translation! -It's come to my attention that I may have attacked [civName], a city-state under your protection.\nWhile it was not my goal to be at odds with your empire, this was deemed a necessary course of action. = - # Requires translation! -I thought you might like to know that I've launched an invasion of one of your little pet states.\nThe lands of [civName] will make a fine addition to my own. = +I've been informed that my armies have taken tribute from [civName], a city-state under your protection.\nI assure you, this was quite unintentional, and I hope that this does not serve to drive us apart. = Saya telah dimaklumkan bahawa tentera saya telah menerima penghormatan daripada [civName], sebuah negara kota di bawah perlindungan anda.\nSaya memberi jaminan kepada anda, perkara ini agak tidak disengajakan dan saya berharap ini tidak akan memisahkan kita +We asked [civName] for a tribute recently and they gave in.\nYou promised to protect them from such things, but we both know you cannot back that up. = Kami meminta [civName] untuk penghormatan baru-baru ini dan mereka menyerah.\nAnda berjanji untuk melindungi mereka daripada perkara sedemikian, tetapi kami berdua tahu anda tidak boleh menyokongnya. +It's come to my attention that I may have attacked [civName], a city-state under your protection.\nWhile it was not my goal to be at odds with your empire, this was deemed a necessary course of action. = Saya mendapat pemerhatian kepada saya mungkin telah menyerang [civName], sebuah negara kota di bawah perlindungan anda.\nWalaupun bukan matlamat saya untuk bertentangan dengan empayar anda, ini dianggap sebagai tindakan yang perlu. +I thought you might like to know that I've launched an invasion of one of your little pet states.\nThe lands of [civName] will make a fine addition to my own. = Saya fikir anda mungkin ingin tahu bahawa saya telah melancarkan pencerobohan ke atas salah satu negeri haiwan peliharaan kecil anda.\nTanah [civName] akan menambah baik kepada negeri saya sendiri. - # Requires translation! -Return [unitName] to [civName]? = - # Requires translation! -The [unitName] we liberated originally belonged to [civName]. They will be grateful if we return it to them. = +Return [unitName] to [civName]? = Kembalikan [unitName] kepada [civName]? +The [unitName] we liberated originally belonged to [civName]. They will be grateful if we return it to them. = [unitName] yang kami membebaskan asalnya milik [civName]. Mereka akan bersyukur jika kita kembalikan kepada mereka. - # Requires translation! -Enter the amount of gold = +Enter the amount of gold = Masuk jumlah emas # City-States @@ -240,52 +203,35 @@ Gift [giftAmount] gold (+[influenceAmount] influence) = Memberikan [giftAmount] Relationship changes in another [turnsToRelationshipChange] turns = Hubungan ubah dalam [turnsToRelationshipChange] giliran Protected by = Dilindungi Revoke Protection = Batalkan perlindungan - # Requires translation! -Revoke protection for [cityStateName]? = +Revoke protection for [cityStateName]? = Batalkan perlindungan untuk [cityStateName]? Pledge to protect = Janji perlindungan Declare Protection of [cityStateName]? = Isytiharkan perlindungan [cityStateName]? -Build [improvementName] on [resourceName] (200 Gold) = Bina [improvementName] pada [resourceName] (200 Emas) +Build [improvementName] on [resourceName] (200 Gold) = Bina [improvementName] pada [resourceName] (200 Gold) Gift Improvement = Peningkatan Hadiah - # Requires translation! -[civName] is able to provide [unitName] once [techName] is researched. = +[civName] is able to provide [unitName] once [techName] is researched. = [civName] mampu menyediakan [unitName] sekali [techName] telah diteliti. - # Requires translation! -Diplomatic Marriage ([amount] Gold) = - # Requires translation! -We have married into the ruling family of [civName], bringing them under our control. = - # Requires translation! -[civName] has married into the ruling family of [civName2], bringing them under their control. = - # Requires translation! -You have broken your Pledge to Protect [civName]! = - # Requires translation! -City-States grow wary of your aggression. The resting point for Influence has decreased by [amount] for [civName]. = +Diplomatic Marriage ([amount] Gold) = Perkahwinan Diplomatik ([amount] Gold) +We have married into the ruling family of [civName], bringing them under our control. = Kita sudah berkahwin dengan keluarga pemerintah [civName], membawa meraka bawah kawalan kami. +[civName] has married into the ruling family of [civName2], bringing them under their control. = [civName] telah berkahwin dengan keluarga pemerintah [civName2], membawa mereka bawah kawalan mereka. +You have broken your Pledge to Protect [civName]! = Anda telah memecahkan ikrar untuk melindungi [civName]! +City-States grow wary of your aggression. The resting point for Influence has decreased by [amount] for [civName]. = Negara Kota berhati-hati dengan pencerobohan anda. Tempat berehat untuk Pengaruh telah turun [amount] untuk [civName]. - # Requires translation! -[cityState] is being attacked by [civName] and asks all major civilizations to help them out by gifting them military units. = - # Requires translation! -[cityState] is being invaded by Barbarians! Destroy Barbarians near their territory to earn Influence. = - # Requires translation! -[cityState] is grateful that you killed a Barbarian that was threatening them! = - # Requires translation! -[cityState] is being attacked by [civName]! Kill [amount] of the attacker's military units and they will be immensely grateful. = - # Requires translation! -[cityState] is deeply grateful for your assistance in the war against [civName]! = - # Requires translation! -[cityState] no longer needs your assistance against [civName]. = - # Requires translation! -War against [civName] = - # Requires translation! -We need you to help us defend against [civName]. Killing [amount] of their military units would slow their offensive. = - # Requires translation! -Currently you have killed [amount] of their military units. = - # Requires translation! -You need to find them first! = +[cityState] is being attacked by [civName] and asks all major civilizations to help them out by gifting them military units. = [cityState] sedang diserang oleh [civName] dan meminta semua tamadun utama membantu mereka dengan menghadiahkan mereka unit tentera. +[cityState] is being invaded by Barbarians! Destroy Barbarians near their territory to earn Influence. = [cityState] sedang diceroboh oleh orang gasar! Musnahkan orang gasar berhampiran wilayah mereka untuk mendapatkan Pengaruh. +[cityState] is grateful that you killed a Barbarian that was threatening them! = [cityState] bersyukur kerana anda membunuh seorang orang gasar yang mengancam mereka! +[cityState] is being attacked by [civName]! Kill [amount] of the attacker's military units and they will be immensely grateful. = [cityState] sedang diserang oleh [civName]! Bunuh [amount] unit tentera penyerang dan mereka akan sangat bersyukur. +[cityState] is deeply grateful for your assistance in the war against [civName]! = [cityState] amat berterima kasih atas bantuan anda dalam perang menentang [civName]! +[cityState] no longer needs your assistance against [civName]. = [cityState] tidak lagi memerlukan bantuan anda terhadap [civName]. + +War against [civName] = Peperangan melawan [civName] +We need you to help us defend against [civName]. Killing [amount] of their military units would slow their offensive. = Kami memerlukan anda untuk membantu kami mempertahankan diri daripada [civName]. Membunuh [amount] unit tentera mereka akan memperlahankan serangan mereka. +Currently you have killed [amount] of their military units. = Pada masa ini anda telah membunuh [amount] unit tentera mereka. +You need to find them first! = Anda perlu mencari mereka dulu! Cultured = Berbudaya Maritime = Maritim Mercantile = Perdagangan - # Requires translation! -Religious = +Religious = Beragama Militaristic = Ketenteraan Type = Jenis Friendly = Ramah @@ -296,73 +242,47 @@ Influence = Pengaruhan # Requires translation! Ally: [civilization] with [amount] Influence = - # Requires translation! -Unknown civilization = +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 - # Requires translation! -When Friends: = - # Requires translation! -When Allies: = - # Requires translation! -The unique luxury is one of: = - # Requires translation! -Demand Tribute = - # Requires translation! -Tribute Willingness = - # Requires translation! -At least 0 to take gold, at least 30 and size 4 city for worker = - # Requires translation! -Take [amount] gold (-15 Influence) = - # Requires translation! -Take worker (-50 Influence) = - # Requires translation! -[civName] is afraid of your military power! = +When Friends: = Apabila Berkawan: +When Allies: = Apabila Bersekutu: +The unique luxury is one of: = Kemewahan yang unik adalah salah satunya: +Demand Tribute = Tuntut Penghormatan +Tribute Willingness = Kemahuan Penghormatan +At least 0 to take gold, at least 30 and size 4 city for worker = Sekurang-kurangnya 0 untuk mengambil emas, sekurang-kurangnya 30 dan saiz 4 bandar untuk pekerja. +Take [amount] gold (-15 Influence) = Mengambil [amount] emas (-15 Influence) +Take worker (-50 Influence) = Mengambil Pekerja (-50 Influence) +[civName] is afraid of your military power! = [civName] adalah takut dengan kekuatan militari anda! - # Requires translation! -Major Civ = - # Requires translation! -No Cities = - # Requires translation! -Base value = - # Requires translation! -Has Ally = - # Requires translation! -Has Protector = - # Requires translation! -Demanding a Worker = - # Requires translation! -Demanding a Worker from small City-State = - # Requires translation! -Very recently paid tribute = - # Requires translation! -Recently paid tribute = - # Requires translation! -Influence below -30 = - # Requires translation! -Military Rank = - # Requires translation! -Military near City-State = - # Requires translation! -Sum: = +Major Civ = Civ Utama +No Cities = Tiada Bandar +Base value = Nilai Asas +Has Ally = Mempunyai Sekutu +Has Protector = Mempunyai Pemelindung. +Demanding a Worker = Menuntut Pekerja +Demanding a Worker from small City-State = Menuntut Pekerja daripada Negara Kota kecil. +Very recently paid tribute = Baru-baru ini memberi penghormatan. +Recently paid tribute = Baru memberi penghormatan. +Influence below -30 = Pengaruh bawah -30 +Military Rank = Pangkat Tentera +Military near City-State = Tentera berdekatan dengan Negara Kota +Sum: = Jumlah: # Trades Trade = Perdagangan Offer trade = Tawar perdagangan - # Requires translation! -They'll decide on their turn = +They'll decide on their turn = Mereka akan membuat keputusan pada giliran mereka. Retract offer = Tarik balik tawaran What do you have in mind? = Apa yang ada dalam fikiran anda? Our items = Barang kami Our trade offer = Tawaran perdaganan kami [otherCiv]'s trade offer = Tawaran perdagangan [otherCiv] [otherCiv]'s items = Barang [otherCiv] - # Requires translation! -+[amount] untradable copy = - # Requires translation! -+[amount] untradable copies = ++[amount] untradable copy = +[amount] salinan yang tidak boleh diniagakan ++[amount] untradable copies = +[amount] salinan yang tidak boleh diniagakan Pleasure doing business with you! = Kami gembira berdagang dengan kamu! I think not. = Saya rasa tidak. That is acceptable. = Ini boleh diterima. @@ -371,8 +291,7 @@ Keep going = Teruskan There's nothing on the table = Tiada apa-apa dalam tawaran Peace Treaty = Perjanjian Damai Agreements = Perjanjian - # Requires translation! -Defensive Pact = +Defensive Pact = Pakatan Pertahanan Open Borders = Sempadan Terbuka Gold per turn = Emas setiap giliran Cities = Bandar @@ -382,24 +301,18 @@ Introduction to [nation] = Pengenalan kepada [nation] Declare war on [nation] = Isytiharkan perang pada [nation] Luxury resources = Sumber mewah Strategic resources = Sumber strategik - # Requires translation! -Owned by you: [amountOwned] = - # Requires translation! -Non-existent city = +Owned by you: [amountOwned] = Dimiliki oleh anda: [amountOwned] +Non-existent city = Bandar Tidak Wujud # Unit differences [resourceName] not required = [resourceName] tidak diperlukan - # Requires translation! -Lost ability (vs [originalUnit]): [ability] = - # Requires translation! -Upgrade all [count] [unit] ([cost] gold) = +Lost ability (vs [originalUnit]): [ability] = Hilang keupayaan (vs [originalUnit]): [ability] +Upgrade all [count] [unit] ([cost] gold) = Naik taraf semua [count] [unit] ([cost] gold) National ability = Kemampuan kebangsaan [firstValue] vs [secondValue] = [firstValue] lawan [secondValue] - # Requires translation! -Gained = - # Requires translation! -Lost = +Gained = Untung +Lost = Rugi # New game screen @@ -407,7 +320,6 @@ Lost = Uniques = Keunikan Promotions = Promosi Load copied data = Memuatkan data yang disalin - # Requires translation! Reset to defaults = # Requires translation! Select nations = diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index eb5cca7695..625af4692b 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -16,7 +16,7 @@ StartWithCapitalLetter = true # 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 = +Fastlane_short_description = Otwartoźródłowa gra strategiczna 4X o budowaniu cywilizacji # 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 @@ -815,9 +815,9 @@ Landscape (fixed) = Pionowa (zablokowane) Portrait (fixed) = Pozioma (zablokowane) Auto (sensor adjusted) = Autoobracanie # Requires translation! -Enable using display cutout areas = +Enable using display cutout areas = Włącz wyświetlanie na obszarze notch'a # Requires translation! -Hide system status and navigation bars = +Hide system status and navigation bars = Schowaj status systemu i paski adresu Font family = Wybierz czcionkę Font size multiplier = Skala rozmiaru czcionki Default Font = Podstawowa czcionka @@ -1553,7 +1553,7 @@ Improvement [improvement] does not exist in ruleset! = Ulepszenie [improvement] Nation [nation] does not exist in ruleset! = Cywilizacja [nation] nie istnieje w zestawie reguł! Natural Wonder [naturalWonder] does not exist in ruleset! = Cud Natury [naturalWonder] nie istnieje w zestawie reguł! # Requires translation! -non-[filter] = +non-[filter] = nie-[filter] # Civilopedia difficulty levels Player settings = Ustawienia gracza: @@ -2075,7 +2075,7 @@ Can transform to [unit] = Można przekształcić w [unit] [amount] Sight = [amount] do zasięgu widzenia [amount] Range = …Zasięg ostrzału [amount] # Requires translation! -[relativeAmount] Air Interception Range = +[relativeAmount] Air Interception Range = [relativeAmount] zasięgu przechwycenia [amount] HP when healing = [amount] PŻ podczas leczenia [relativeAmount]% Spread Religion Strength = [relativeAmount]% siły szerzenia religii When spreading religion to a city, gain [amount] times the amount of followers of other religions as [stat] = Szerząc daną religię w mieście, uzyskasz [amount] razy więcej punktów [stat] niż liczba wyznawców innych religii @@ -2648,7 +2648,7 @@ Aqueduct = Akwedukt Heroic Epic = Epos Heroiczny # Requires translation! -All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = +All newly-trained [baseUnitFilter]] units [cityFilter] receive the [promotion] promotion = Wszystkie nowe jednostki [baseUnitFilter] [cityFilter] otrzymują awans [promotion] Colossus = Kolos 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = „Człowiek ten stanął okrakiem nad światem jak Kolos, gdy my, ludzie malusieńcy, spod jego wielkich nóg zerkamy wokół, szukając sobie upodlonych grobów.”\n\n– William Szekspir (Juliusz Cezar) @@ -3414,7 +3414,7 @@ Ota = Ota Tottori = Tottori Japan = Japonia # Requires translation! -for [mapUnitFilter]] units = +for [mapUnitFilter]] units = dla jednostek [mapUnitFilter] Gandhi = Mahatma Gandhi I have just received a report that large numbers of my troops have crossed your borders. = Otrzymałem właśnie raport, że duża liczba moich żołnierzy przekroczyła wasze granice. diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 0d9f3b9431..e97f90c268 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 = 929 - const val appVersion = "4.8.19" + const val appCodeNumber = 930 + const val appVersion = "4.8.20" const val gdxVersion = "1.12.1" const val ktorVersion = "2.2.3" diff --git a/changelog.md b/changelog.md index 153eeaf51e..dc4550f102 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,43 @@ +## 4.8.20 + +Resolved - City centers don't provide resources you don't have tech to extract + +Settlers no longer stuck in endless loops wanting to found cities on tiles they can't reach @tuvus + +Delete .github/ISSUE_TEMPLATE/feature_request.md + +Create feature-request.yml + +Delete .github/ISSUE_TEMPLATE/bug_report.md + +Create bug-report.yml + +Resolves resolves #10425 - Conditional tile checks pre-placement + +Resolved - AI clears inquisitors from city centers to make way for spaceship units + +More simplification of motivationToAttack + +Separated hasAtLeastMotivationToAttack into separate class, split into subfunctions for main function readability + +Unified errorSeverityForFilter checks into single function, we have a LOT of filters! + +Added tests for parameters for complex filters, fixed nested complex filter returning 'possible filtering' when it should have been known + +Better formatting for general filter rules v2 + +Better formatting for general filter rules + +Add the SellBuilding Unique - By PLynx01 + +Add gain stat modified by speed and improvement speed by filter uniques - By SeventhM + +Add a TriggerUponDiscoveringTile unique type - By karmaBonfire + +By SomeTroglodyte: +- Support for Leader voices +- [code quality] Reorg, clean up and comment a few things + ## 4.8.19 Modding: Added "non-[filter]" filtering for unit filters, and multi-value filtering to all filters diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index d4f16009d8..2d79cf623b 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -468,7 +468,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.8.19", 929) + val VERSION = Version("4.8.20", 930) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/930.txt b/fastlane/metadata/android/en-US/changelogs/930.txt new file mode 100644 index 0000000000..393b99dcb6 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/930.txt @@ -0,0 +1,39 @@ + + +Resolved - City centers don't provide resources you don't have tech to extract + +Settlers no longer stuck in endless loops wanting to found cities on tiles they can't reach @tuvus + +Delete .github/ISSUE_TEMPLATE/feature_request.md + +Create feature-request.yml + +Delete .github/ISSUE_TEMPLATE/bug_report.md + +Create bug-report.yml + +Resolves resolves #10425 - Conditional tile checks pre-placement + +Resolved - AI clears inquisitors from city centers to make way for spaceship units + +More simplification of motivationToAttack + +Separated hasAtLeastMotivationToAttack into separate class, split into subfunctions for main function readability + +Unified errorSeverityForFilter checks into single function, we have a LOT of filters! + +Added tests for parameters for complex filters, fixed nested complex filter returning 'possible filtering' when it should have been known + +Better formatting for general filter rules v2 + +Better formatting for general filter rules + +Add the SellBuilding Unique - By PLynx01 + +Add gain stat modified by speed and improvement speed by filter uniques - By SeventhM + +Add a TriggerUponDiscoveringTile unique type - By karmaBonfire + +By SomeTroglodyte: +- Support for Leader voices +- [code quality] Reorg, clean up and comment a few things \ No newline at end of file