From fe78ba91e4be001e3d9514816a159702916db0f9 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 25 Apr 2024 16:41:36 +0300 Subject: [PATCH] Version rollout (#11520) * Bump version and create initial changelog entry * Update Indonesian.properties (#11519) I am X2003 from Discord and my account has been unblocked. I have also fixed the mistranslated words and translated the untranslated words. * Update Portuguese.properties (#11518) * Update Portuguese.properties * Update Portuguese.properties * Update Portuguese.properties * Update Portuguese.properties * Update Portuguese.properties * Update Portuguese.properties * Update Italian.properties (#11515) * Update French.properties (#11514) * Update Catalan.properties (#11513) * Update Brazilian_Portuguese.properties (#11512) * Detekt --------- Co-authored-by: yairm210 Co-authored-by: X2003 <158255876+Xenia2003@users.noreply.github.com> Co-authored-by: nexphilim <75545134+nexphilim@users.noreply.github.com> Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com> Co-authored-by: Ouaz Co-authored-by: Joan Josep Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com> --- .../Brazilian_Portuguese.properties | 39 ++--- .../jsons/translations/Catalan.properties | 45 ++--- .../jsons/translations/French.properties | 28 ++-- .../jsons/translations/Indonesian.properties | 114 ++++++------- .../jsons/translations/Italian.properties | 39 ++--- .../jsons/translations/Portuguese.properties | 157 ++++++------------ buildSrc/src/main/kotlin/BuildConfig.kt | 4 +- changelog.md | 30 ++++ core/src/com/unciv/UncivGame.kt | 2 +- .../com/unciv/models/ruleset/unit/BaseUnit.kt | 6 +- .../metadata/android/en-US/changelogs/992.txt | 29 ++++ 11 files changed, 231 insertions(+), 262 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/992.txt diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index a1512017dc..c09fbc4234 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -75,16 +75,11 @@ Hydro Plant = Hidroelétrica # City naming when list exhausted - # Requires translation! -New [cityName] = - # Requires translation! -Neo [cityName] = - # Requires translation! -Nova [cityName] = - # Requires translation! -Altera [cityName] = - # Requires translation! -New [civName]\n(formerly known as [cityName]) = +New [cityName] = Nova [cityName] +Neo [cityName] = Neo [cityName] +Nova [cityName] = Nova [cityName] +Altera [cityName] = Altera [cityName] +New [civName]\n(formerly known as [cityName]) = Novo [civName]\n(anteriormente conhecido como [cityName]) # Diplomacy,Trade,Nations @@ -160,21 +155,14 @@ Denounce ([numberOfTurns] turns) = Condenar ([numberOfTurns] turnos) We will remember this. = Nós iremos lembrar disto. [civName] has declared war on [targetCivName]! = [civName] declarou guerra contra [targetCivName]! - # Requires translation! -[civName] has joined [allyCivName] in the war against us! = - # Requires translation! -We have joined [allyCivName] in the war against [enemyCivName]! = - # Requires translation! -[civName] has joined [allyCivName] in the war against [enemyCivName]! = - # Requires translation! -[civName] has joined us in the war against [enemyCivName]! = +[civName] has joined [allyCivName] in the war against us! = [civName] juntou-se a [allyCivName] na guerra contra nós! +We have joined [allyCivName] in the war against [enemyCivName]! = Nós nos juntamos a [allyCivName] na guerra contra [enemyCivName]! +[civName] has joined [allyCivName] in the war against [enemyCivName]! = [civName] juntou-se a [allyCivName] na guerra contra [enemyCivName]! +[civName] has joined us in the war against [enemyCivName]! = [civName] juntou-se a nós na guerra contra [enemyCivName]! - # Requires translation! -[civName] cancelled their Defensive Pact with [otherCivName]! = - # Requires translation! -[civName] cancelled their Defensive Pact with us! = - # Requires translation! -We have cancelled our Defensive Pact with [civName]! = +[civName] cancelled their Defensive Pact with [otherCivName]! = [civName] cancelou seu Pacto Defensivo com [otherCivName]! +[civName] cancelled their Defensive Pact with us! = [civName] cancelou seu Pacto Defensivo conosco! +We have cancelled our Defensive Pact with [civName]! = Cancelamos nosso Pacto Defensivo com [civName]! [civName] and [targetCivName] have signed a Peace Treaty! = [civName] e [targetCivName] assinaram um Tratado de Paz! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] e [targetCivName] assinaram a Declaração de Amizade! @@ -1561,8 +1549,7 @@ My friend, shall we declare our friendship to the world? = Meu amigo, devemos de Sign Declaration of Friendship ([30] turns) = Assinar Declaração de Amizade ([30] turnos) We are not interested. = Nós não estamos interessados. We have signed a Declaration of Friendship with [otherCiv]! = Nós assinamos uma Declaração de Amizade com [otherCiv]! - # Requires translation! -[civName] and [otherCivName] have signed a Defensive Pact! = +[civName] and [otherCivName] have signed a Defensive Pact! = [civName] e [otherCivName] assinaram um Pacto Defensivo! [otherCiv] has denied our Declaration of Friendship! = [otherCiv] negou nossa Declaração de Amizade! Basics = Básicos diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties index 17f0247143..916e3e0e1f 100644 --- a/android/assets/jsons/translations/Catalan.properties +++ b/android/assets/jsons/translations/Catalan.properties @@ -75,16 +75,11 @@ Hydro Plant = Central hidroelèctrica # City naming when list exhausted - # Requires translation! -New [cityName] = - # Requires translation! -Neo [cityName] = - # Requires translation! -Nova [cityName] = - # Requires translation! -Altera [cityName] = - # Requires translation! -New [civName]\n(formerly known as [cityName]) = +New [cityName] = Nova [cityName] +Neo [cityName] = Hospitalet de [cityName] +Nova [cityName] = Vilanova de [cityName] +Altera [cityName] = El Pla de [cityName] +New [civName]\n(formerly known as [cityName]) = Nova [civName]\n(abans coneguda com a [cityName]) # Diplomacy,Trade,Nations @@ -160,21 +155,14 @@ Denounce ([numberOfTurns] turns) = Denuncia ([numberOfTurns] torns) We will remember this. = Ens en recordarem. [civName] has declared war on [targetCivName]! = [civName] ha declarat la guerra a [targetCivName]! - # Requires translation! -[civName] has joined [allyCivName] in the war against us! = - # Requires translation! -We have joined [allyCivName] in the war against [enemyCivName]! = - # Requires translation! -[civName] has joined [allyCivName] in the war against [enemyCivName]! = - # Requires translation! -[civName] has joined us in the war against [enemyCivName]! = +[civName] has joined [allyCivName] in the war against us! = [civName] s’ha aliat amb [allyCivName] en la guerra contra nosaltres! +We have joined [allyCivName] in the war against [enemyCivName]! = Ens hem aliat amb [allyCivName] en la guerra contra [enemyCivName]! +[civName] has joined [allyCivName] in the war against [enemyCivName]! = [civName] s’ha aliat amb [allyCivName] en la guerra contra [enemyCivName]! +[civName] has joined us in the war against [enemyCivName]! = [civName] s’ha aliat amb nosaltres en la guerra contra [enemyCivName]! - # Requires translation! -[civName] cancelled their Defensive Pact with [otherCivName]! = - # Requires translation! -[civName] cancelled their Defensive Pact with us! = - # Requires translation! -We have cancelled our Defensive Pact with [civName]! = +[civName] cancelled their Defensive Pact with [otherCivName]! = [civName] ha cancel·lat el seu pacte de defensa amb [otherCivName]! +[civName] cancelled their Defensive Pact with us! = [civName] ha cancel·lat el pacte de defensa que tenia amb nosaltres! +We have cancelled our Defensive Pact with [civName]! = Hem cancel·lat el pacte de defensa que teníem amb [civName]! [civName] and [targetCivName] have signed a Peace Treaty! = [civName] i [targetCivName] han signat un tractat de pau. [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] i [targetCivName] han signat una declaració d’amistat. @@ -1561,8 +1549,7 @@ My friend, shall we declare our friendship to the world? = Amic meu, voleu anunc Sign Declaration of Friendship ([30] turns) = Signa una declaració d’amistat ([30] torns) We are not interested. = No hi estem interessats. We have signed a Declaration of Friendship with [otherCiv]! = Hem signat una declaració d’amistat amb [otherCiv]! - # Requires translation! -[civName] and [otherCivName] have signed a Defensive Pact! = +[civName] and [otherCivName] have signed a Defensive Pact! = [civName] i [otherCivName] han signat un pacte de defensa! [otherCiv] has denied our Declaration of Friendship! = [otherCiv] ha rebutjat la nostra declaració d’amistat. Basics = Bàsics @@ -1899,10 +1886,8 @@ Stars ￬ = Valoració ￬ Status ￬ = Estat ￬ Scenarios = Escenaris - # Requires translation! -Error loading scenario: = - # Requires translation! -Choose scenario = +Error loading scenario: = Error mentre es carregava l’escenari: +Choose scenario = Escolliu un escenari # Uniques that are relevant to more than one type of game object diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 611fea1270..b14733e68e 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -76,15 +76,15 @@ Hydro Plant = Centrale Hydroélectrique # City naming when list exhausted # Requires translation! -New [cityName] = +New [cityName] = New [cityName] # Requires translation! -Neo [cityName] = +Neo [cityName] = Néo [cityName] # Requires translation! -Nova [cityName] = +Nova [cityName] = Nova [cityName] # Requires translation! -Altera [cityName] = +Altera [cityName] = Altera [cityName] # Requires translation! -New [civName]\n(formerly known as [cityName]) = +New [civName]\n(formerly known as [cityName]) = New [civName]\n(auparavant [cityName]) # Diplomacy,Trade,Nations @@ -159,22 +159,22 @@ Denounce [civName]? = Dénoncer [civName] ? Denounce ([numberOfTurns] turns) = Dénoncer ([numberOfTurns] tours) We will remember this. = Nous nous en souviendrons. -[civName] has declared war on [targetCivName]! = [civName] a déclaré la guerre à la civilisation [targetCivName] ! +[civName] has declared war on [targetCivName]! = [civName] a déclaré la guerre à [targetCivName] ! # Requires translation! -[civName] has joined [allyCivName] in the war against us! = +[civName] has joined [allyCivName] in the war against us! = [civName] a rejoint [allyCivName] dans la guerre qui nous oppose ! # Requires translation! -We have joined [allyCivName] in the war against [enemyCivName]! = +We have joined [allyCivName] in the war against [enemyCivName]! = Nous avons rejoint [allyCivName] dans la guerre contre [enemyCivName] ! # Requires translation! -[civName] has joined [allyCivName] in the war against [enemyCivName]! = +[civName] has joined [allyCivName] in the war against [enemyCivName]! = [civName] a rejoint [allyCivName] dans la guerre contre [enemyCivName] ! # Requires translation! -[civName] has joined us in the war against [enemyCivName]! = +[civName] has joined us in the war against [enemyCivName]! = [civName] nous a rejoint dans la guerre contre [enemyCivName] ! # Requires translation! -[civName] cancelled their Defensive Pact with [otherCivName]! = +[civName] cancelled their Defensive Pact with [otherCivName]! = [civName] a annulé son pacte de défense avec [otherCivName] ! # Requires translation! -[civName] cancelled their Defensive Pact with us! = +[civName] cancelled their Defensive Pact with us! = [civName] a annulé le pacte de défense que nous avions signé ! # Requires translation! -We have cancelled our Defensive Pact with [civName]! = +We have cancelled our Defensive Pact with [civName]! = Nous avons annulé notre pacte de défense avec [civName] ! [civName] and [targetCivName] have signed a Peace Treaty! = [civName] et [targetCivName] ont signé un traité de paix ! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] et [targetCivName] ont signé une Déclaration d'Amitié ! @@ -1562,7 +1562,7 @@ Sign Declaration of Friendship ([30] turns) = Signer une Déclaration d'Amitié We are not interested. = Nous ne sommes pas intéressés. We have signed a Declaration of Friendship with [otherCiv]! = Nous avons signé une Déclaration d'Amitié avec [otherCiv] ! # Requires translation! -[civName] and [otherCivName] have signed a Defensive Pact! = +[civName] and [otherCivName] have signed a Defensive Pact! = [civName] et [otherCivName] ont signé un Pacte de Défense ! [otherCiv] has denied our Declaration of Friendship! = [otherCiv] a rejeté notre Déclaration d'Amitié! Basics = Basiques diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 2c6af3966c..04add71f46 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -76,15 +76,15 @@ Hydro Plant = PLTA # City naming when list exhausted # Requires translation! -New [cityName] = +New [cityName] = [cityName] Baru # Requires translation! -Neo [cityName] = +Neo [cityName] = Neo [cityName] # Requires translation! -Nova [cityName] = +Nova [cityName] = Nova [cityName] # Requires translation! -Altera [cityName] = +Altera [cityName] = Altera [cityName] # Requires translation! -New [civName]\n(formerly known as [cityName]) = +New [civName]\n(formerly known as [cityName]) = [civName] baru\n(dulunya dikenal sebagai [cityName]) # Diplomacy,Trade,Nations @@ -110,7 +110,7 @@ Can only be purchased = Hanya dapat dibeli See also = Lihat juga Requires at least one of the following: = Memerlukan setidaknya salah satu dari hal-hal berikut ini: -Requires all of the following: = Memerlukan hal-hal berikut ini: +Requires all of the following: = Memerlukan semua hal berikut ini: Leads to [techName] = Membuka [techName] Leads to: = Membuka: Enables: = Mengaktifkan: @@ -159,22 +159,22 @@ Denounce [civName]? = Hina [civName]? Denounce ([numberOfTurns] turns) = Hina ([numberOfTurns] giliran) We will remember this. = Kami akan mengingat ini. -[civName] has declared war on [targetCivName]! = [civName] menyatakan perang kepada [targetCivName]! +[civName] has declared war on [targetCivName]! = [civName] telah menyatakan perang kepada [targetCivName]! # Requires translation! -[civName] has joined [allyCivName] in the war against us! = +[civName] has joined [allyCivName] in the war against us! = [civName] telah bergabung dengan [allyCivName] dalam perang melawan kita! # Requires translation! -We have joined [allyCivName] in the war against [enemyCivName]! = +We have joined [allyCivName] in the war against [enemyCivName]! = Kita telah bergabung dengan [allyCivName] dalam perang melawan [enemyCivName]! # Requires translation! -[civName] has joined [allyCivName] in the war against [enemyCivName]! = +[civName] has joined [allyCivName] in the war against [enemyCivName]! = [civName] telah bergabung dengan [allyCivName] dalam perang melawan [enemyCivName]! # Requires translation! -[civName] has joined us in the war against [enemyCivName]! = +[civName] has joined us in the war against [enemyCivName]! = [civName] telah bergabung dengan kita dalam perang melawan [enemyCivName]! # Requires translation! -[civName] cancelled their Defensive Pact with [otherCivName]! = +[civName] cancelled their Defensive Pact with [otherCivName]! = [civName] membatalkan Pakta Pertahanan mereka dengan [otherCivName]! # Requires translation! -[civName] cancelled their Defensive Pact with us! = +[civName] cancelled their Defensive Pact with us! = [civName] membatalkan Pakta Pertahanan mereka dengan kita! # Requires translation! -We have cancelled our Defensive Pact with [civName]! = +We have cancelled our Defensive Pact with [civName]! = Kita telah membatalkan Pakta Pertahanan kita dengan [civName]! [civName] and [targetCivName] have signed a Peace Treaty! = [civName] dan [targetCivName] telah menandatangani Traktat Perdamaian! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] and [targetCivName] telah menandatangani Deklarasi Pertemanan! @@ -184,10 +184,10 @@ Break promise = Ingkari janji We promised not to settle near them ([count] turns remaining) = Kita sudah berjanji untuk tidak menetap di dekat mereka ([count] giliran lagi) They promised not to settle near us ([count] turns remaining) = Mereka sudah berjanji untuk tidak menetap di dekat kita ([count] giliran lagi) -[civName] is upset that you demanded tribute from [cityState], whom they have pledged to protect! = [civName] kecewa karena kamu menagih upeti dari [cityState], yang mereka lindungi! -[civName] is upset that you attacked [cityState], whom they have pledged to protect! = [civName] kecewa karena kamu menyerang [cityState], yang mereka lindungi! -[civName] is outraged that you destroyed [cityState], whom they had pledged to protect! = [civName] marah karena kamu menghancurkan [cityState], yang mereka lindungi! -[civName] has destroyed [cityState], whom you had pledged to protect! = [civName] telah menghancurkan [cityState], yang kamu lindungi! +[civName] is upset that you demanded tribute from [cityState], whom they have pledged to protect! = [civName] kecewa karena kamu menagih upeti dari [cityState], yang mereka sumpah untuk lindungi! +[civName] is upset that you attacked [cityState], whom they have pledged to protect! = [civName] kecewa karena kamu menyerang [cityState], yang mereka sumpah untuk lindungi! +[civName] is outraged that you destroyed [cityState], whom they had pledged to protect! = [civName] marah karena kamu menghancurkan [cityState], yang mereka sumpah untuk lindungi! +[civName] has destroyed [cityState], whom you had pledged to protect! = [civName] telah menghancurkan [cityState], yang kamu sumpah untuk lindungi! Unforgivable = Tidak Termaafkan Afraid = Ditakuti @@ -236,7 +236,7 @@ Pledge to protect = Bersumpah untuk melindungi Declare Protection of [cityStateName]? = Nyatakan Perlindungan atas [cityStateName]? Build [improvementName] on [resourceName] (200 Gold) = Bangun [improvementName] untuk [resourceName] (200 Emas) Gift Improvement = Hadiahkan Peningkatan -[civName] is able to provide [unitName] once [techName] [isOrAre] researched. = [civName] bisa menyediakan [unitName] saat [techName] [isOrAre]riset. +[civName] is able to provide [unitName] once [techName] [isOrAre] researched. = [civName] bisa menyediakan [unitName] saat [techName] [isOrAre]teliti. is = di are = di @@ -247,7 +247,7 @@ You have broken your Pledge to Protect [civName]! = Kamu telah mengingkari Sumpa City-States grow wary of your aggression. The resting point for Influence has decreased by [amount] for [civName]. = Negara-Kota bersikap waspada dengan agresimu. Titik normal Pengaruh berkurang sebesar [amount] untuk [civName]. [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 peradaban besar untuk membantu mereka dengan memberikan mereka unit-unit militer. -[cityState] is being invaded by Barbarians! Destroy Barbarians near their territory to earn Influence. = [cityState] sedang diserang Orang Barbar! Binasakan Orang-orang Barbar di sekitar daerah mereka untuk mendapatkan Pengaruh. +[cityState] is being invaded by Barbarians! Destroy Barbarians near their territory to earn Influence. = [cityState] sedang diserbu oleh Orang Barbar! Binasakanlah Orang-orang Barbar di sekitar wilayah mereka untuk mendapatkan Pengaruh. [cityState] is grateful that you killed a Barbarian that was threatening them! = [cityState] sangat berterima kasih karena kamu telah membunuh Orang Barbar 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 militer penyerang dan mereka akan sangat berterima kasih atas pertolonganmu. [cityState] is deeply grateful for your assistance in the war against [civName]! = [cityState] sangat berterima kasih untuk bantuanmu dalam melawan [civName]! @@ -982,12 +982,12 @@ An enemy [unit] was spotted in our territory = [unit] musuh terlihat di wilayah An enemy [unit] has destroyed our tile improvement [improvement] = Sebuah [unit] musuh telah menghancurkan peningkatan daerah [improvement] kita Your city [cityName] can bombard the enemy! = Kota [cityName] kepunyaanmu bisa membombardir musuh! [amount] of your cities can bombard the enemy! = [amount] kotamu bisa membombardir musuh! -[amount] enemy units were spotted near our territory = [amount] unit musuh terlihat di dekat daerah kita -[amount] enemy units were spotted in our territory = [amount] unit musuh terlihat di daerah kita -A(n) [nukeType] from [civName] has exploded in our territory! = Sebuah [nukeType] dari [civName] telah meledak di teritori kita! +[amount] enemy units were spotted near our territory = [amount] unit musuh terlihat di dekat wilayah kita +[amount] enemy units were spotted in our territory = [amount] unit musuh terlihat di wilayah kita +A(n) [nukeType] from [civName] has exploded in our territory! = Sebuah [nukeType] dari [civName] telah meledak di wilayah kita! A(n) [nukeType] has been detonated by [civName]! = Sebuah [nukeType] telah diledakkan oleh [civName]! A(n) [nukeType] has been detonated by an unkown civilization! = Sebuah [nukeType] telah diledakkan oleh peradaban yang belum diketahui! -After an attempted attack by our [nukeType], [civName] has declared war on us! = Setelah sebuah percobaan penyerangan menggunakan [nukeType] kita, [civName] telah menyatakan perang terhadap negara kita! +After an attempted attack by our [nukeType], [civName] has declared war on us! = Setelah sebuah percobaan penyerangan menggunakan [nukeType] kita, [civName] telah menyatakan perang terhadap kita! After being hit by our [nukeType], [civName] has declared war on us! = Setelah diserang dengan [nukeType], [civName] telah menyatakan perang terhadap negara kita! The civilization of [civName] has been destroyed! = Peradaban [civName] telah dihancurkan! The City-State of [name] has been destroyed! = Negara-Kota [name] telah dihancurkan! @@ -1485,7 +1485,7 @@ Status\n(puppet, resistance or being razed) = Status\n(boneka, perlawanan, atau [victoryType] Victory = Kemenangan [victoryType] Built [building] = Membangun [building] Add all [comment] in capital = Tambahkan semua [comment] di ibu kota -Destroy all players = Hancurkan semua pemain +Destroy all players = Binasakan semua pemain Capture all capitals = Tawan semua ibu kota Complete [amount] Policy branches = Lengkapi [amount] cabang Kebijakan You have won a [victoryType] Victory! = Kamu telah mendapatkan kemenangan [victoryType]! @@ -1562,7 +1562,7 @@ Sign Declaration of Friendship ([30] turns) = Tandatangani Deklarasi Pertemanan We are not interested. = Kami tidak tertarik. We have signed a Declaration of Friendship with [otherCiv]! = Kita telah menandatangani Deklarasi Pertemanan dengan [otherCiv]! # Requires translation! -[civName] and [otherCivName] have signed a Defensive Pact! = +[civName] and [otherCivName] have signed a Defensive Pact! = [civName] dan [otherCivName] telah menandatangani Pakta Pertahanan! [otherCiv] has denied our Declaration of Friendship! = [otherCiv] telah menolak Deklarasi Pertemanan kita! Basics = Dasar @@ -1776,13 +1776,13 @@ Your spy [spyName] has leveled up! = Mata-matamu, [spyName], telah naik level! Your spy [spyName] cannot steal any more techs from [civName] as we've already researched all the technology they know! = Mata-matamu, [spyName], tidak bisa mencuri teknologi lagi dari [civName] karena kita telah meriset semua teknologi yang mereka ketahui! # Stealing Technology defending civ -An unidentified spy stole the Technology [techName] from [cityName]! = Mata-mata yang tidak teridentifikasi mencuri teknologi [techName] dari [cityName]! -A spy from [civName] stole the Technology [techName] from [cityName]! = Mata-mata dari [civName] mencuri teknologi [techName] dari [cityName]! +An unidentified spy stole the Technology [techName] from [cityName]! = Mata-mata yang tidak teridentifikasi mencuri Teknologi [techName] dari [cityName]! +A spy from [civName] stole the Technology [techName] from [cityName]! = Mata-mata dari [civName] mencuri Teknologi [techName] dari [cityName]! A spy from [civName] was found and killed trying to steal Technology in [cityName]! = Mata-mata dari [civName] telah ditemukan dan dibunuh saat mencoba mencuri Teknologi di [cityName]! A spy from [civName] was found and killed by [spyName] trying to steal Technology in [cityName]! = Mata-mata dari [civName] telah ditemukan dan dibunuh oleh [spyName] saat mencoba mencuri Teknologi di [cityName]! # Stealing Technology offending civ -Your spy [spyName] stole the Technology [techName] from [cityName]! = Mata-matamu, [spyName], mencuri teknologi [techName] dari [cityName]! +Your spy [spyName] stole the Technology [techName] from [cityName]! = Mata-matamu, [spyName], mencuri Teknologi [techName] dari [cityName]! Your spy [spyName] was killed trying to steal Technology in [cityName]! = Mata-matamu, [spyName], dibunuh saat mencuri Teknologi di [cityName]! # Rigging elections @@ -1970,10 +1970,10 @@ ConditionalsPlacement = after [stats] = [stats] [stats] [cityFilter] = [stats] [cityFilter] -[stats] from every specialist [cityFilter] = [stats] dari semua spesialis [cityFilter] +[stats] from every specialist [cityFilter] = [stats] dari setiap spesialis [cityFilter] [stats] per [amount] population [cityFilter] = [stats] per [amount] populasi [cityFilter] [stats] per [amount] social policies adopted = [stats] per [amount] kebijakan sosial yang diadopsi -[stats] per every [amount] [civWideStat] = [stats] untuk setiap [amount] [civWideStat] +[stats] per every [amount] [civWideStat] = [stats] setiap [amount] [civWideStat] [stats] in cities on [terrainFilter] tiles = [stats] untuk kota di daerah [terrainFilter] [stats] from all [buildingFilter] buildings = [stats] dari semua bangunan [buildingFilter] [stats] from [tileFilter] tiles [cityFilter] = [stats] dari daerah [tileFilter] [cityFilter] @@ -1985,7 +1985,7 @@ ConditionalsPlacement = after [relativeAmount]% [stat] [cityFilter] = [relativeAmount]% [stat] [cityFilter] [relativeAmount]% [stat] from every [tileFilter/buildingFilter] = [relativeAmount]% [stat] dari setiap [tileFilter/buildingFilter] [relativeAmount]% Yield from every [tileFilter/buildingFilter] = [relativeAmount]% Penghasilan dari setiap [tileFilter/buildingFilter] -[relativeAmount]% [stat] from every follower, up to [relativeAmount2]% = [relativeAmount2]% [stat] untuk setiap pengikut, hingga [relativeAmount]% +[relativeAmount]% [stat] from every follower, up to [relativeAmount2]% = [relativeAmount2]% [stat] dari setiap pengikut, hingga [relativeAmount]% [relativeAmount]% [stat] from City-States = [relativeAmount]% [stat] dari Negara-Kota [relativeAmount]% [stat] from Trade Routes = [relativeAmount]% [stat] dari Rute Perdagangan Nullifies [stat] [cityFilter] = Mengosongkan [stat] [cityFilter] @@ -2089,8 +2089,8 @@ May choose [amount] additional belief(s) of any type when [foundingOrEnhancing] Religion naturally spreads to cities [amount] tiles away = Agama menyebar ke kota-kota yang berjarak hingga [amount] daerah dengan sendirinya May not generate great prophet equivalents naturally = Tidak bisa memunculkan nabi besar atau orang-orang sejenisnya secara alami [relativeAmount]% Faith cost of generating Great Prophet equivalents = [relativeAmount]% biaya Iman untuk menghasilkan orang yang setara Nabi Besar -[relativeAmount]% spy effectiveness [cityFilter] = [relativeAmount]% keefektifan mata-mata [cityFilter] -[relativeAmount]% enemy spy effectiveness [cityFilter] = [relativeAmount]% keefektifan mata-mata musuh [cityFilter] +[relativeAmount]% spy effectiveness [cityFilter] = [relativeAmount]% efektivitas mata-mata [cityFilter] +[relativeAmount]% enemy spy effectiveness [cityFilter] = [relativeAmount]% efektivitas mata-mata musuh [cityFilter] Starting tech = Teknologi mula-mula Starts with [tech] = Memulai dengan [tech] Starts with [policy] adopted = Memulai dengan kebijakan [policy] @@ -2103,7 +2103,7 @@ Cities are razed [amount] times as fast = Kota diruntuhkan [amount] kali lebih c Receive a tech boost when scientific buildings/wonders are built in capital = Mendorong kemajuan teknologi ketika bangunan/keajaiban dunia ilmiah dibangun di ibu kota Can be continually researched = Bisa diteliti terus-menerus [relativeAmount]% Golden Age length = [relativeAmount]% panjang Masa Kejayaan -Population loss from nuclear attacks [relativeAmount]% [cityFilter] = Kehilangan populasi dari serangan nuklir [relativeAmount]% [cityFilter] +Population loss from nuclear attacks [relativeAmount]% [cityFilter] = Populasi yang hilang dari serangan nuklir [relativeAmount]% [cityFilter] Damage to garrison from nuclear attacks [relativeAmount]% [cityFilter] = Kerusakan pada garnisun dari serangan nuklir [relativeAmount]% [cityFilter] Rebel units may spawn = Unit pemberontak dapat muncul Unbuildable = Tidak dapat dibuat @@ -2114,7 +2114,7 @@ Hidden until [amount] social policy branches have been completed = Disembunyikan Only available = Hanya tersedia Unavailable = Tidak tersedia Excess Food converted to Production when under construction = Kelebihan Makanan diubah menjadi Produksi dalam masa pembangunan -Requires at least [amount] population = Membutuhkan setidaknya [amount] populasi +Requires at least [amount] population = Memerlukan setidaknya [amount] populasi Triggers a global alert upon build start = Memicu peringatan global ketika memulai pembangunan Triggers a global alert upon completion = Memicu peringatan global saat selesai Cost increases by [amount] per owned city = Biaya meningkat sebesar [amount] per kota yang dimiliki @@ -2129,8 +2129,8 @@ Indicates the capital city = Menandakan ibu kota Moves to new capital when capital changes = Pindah ke ibu kota baru saat ibu kota berganti Provides 1 extra copy of each improved luxury resource near this City = Memberikan 1 duplikat barang mewah ekstra yang ditingkatkan di dekat Kota ini Destroyed when the city is captured = Hancur ketika kota ditawan -Doubles Gold given to enemy if city is captured = Menggandakan Emas yang diberikan kepada musuh jika kota ini direbut -Remove extra unhappiness from annexed cities = Menghapus ketidakbahagiaan dari daerah yang baru dikuasai +Doubles Gold given to enemy if city is captured = Menggandakan Emas yang diberikan kepada musuh jika kota ini ditawan +Remove extra unhappiness from annexed cities = Menghapus ketidakbahagiaan tambahan dari kota yang dicaplok Connects trade routes over water = Menghubungkan rute perdagangan melalui air Automatically built in all cities where it is buildable = Otomatis dibangun di semua kota jika bisa dibangun Creates a [improvementName] improvement on a specific tile = Membuat peningkatan [improvementName] di daerah yang spesifik @@ -2174,12 +2174,12 @@ Must set up to ranged attack = Harus dipersiapkan untuk serangan jarak jauh Self-destructs when attacking = Menghancurkan diri ketika menyerang Eliminates combat penalty for attacking across a coast = Tidak mendapatkan penalti pertempuran ketika menyerang musuh melalui pesisir May attack when embarked = Dapat menyerang saat melaut -Eliminates combat penalty for attacking over a river = Tidak mendapatkan penalti pertempuran ketika menyerang musuh dengan menyeberangi sungai +Eliminates combat penalty for attacking over a river = Tidak mendapatkan penalti pertempuran ketika menyerang musuh di seberang sungai Blast radius [amount] = Jarak ledakan [amount] Ranged attacks may be performed over obstacles = Serangan jarak jauh dapat dilakukan melampaui halangan Nuclear weapon of Strength [amount] = Kekuatan nuklir [amount] No defensive terrain bonus = Tidak ada bonus medan perlindungan -No defensive terrain penalty = Tidak mendapat penalti medan perlindungan +No defensive terrain penalty = Tidak ada penalti medan perlindungan Damage is ignored when determining unit Strength = Kerusakan tidak dihiraukan saat menentukan Kekuatan unit Uncapturable = Tidak dapat ditawan May withdraw before melee ([amount]%) = Dapat mundur sebelum pertempuran jarak dekat ([amount]%) @@ -2239,7 +2239,7 @@ May enter foreign tiles without open borders, but loses [amount] religious stren [amount] Movement point cost to disembark = [amount] biaya poin Pergerakan untuk mendarat [amount] Movement point cost to embark = [amount] biaya poin Pergerakan untuk melaut All units move through Forest and Jungle Tiles in friendly territory as if they have roads. These tiles can be used to establish City Connections upon researching the Wheel. = Semua unit yang bergerak melalui daerah Hutan dan Hutan Rimba di dalam wilayah bersahabat secepat melewati jalan. Daerah tersebut dapat digunakan untuk mendirikan Hubungan antar Kota saat selesai meneliti teknologi Roda. -Units ignore terrain costs when moving into any tile with Hills = Unit mengabaikan biaya medan saat bergerak ke daerah apapun dengan Perbukitan +Units ignore terrain costs when moving into any tile with Hills = Unit mengabaikan biaya medan saat bergerak ke daerah apa pun dengan Perbukitan Religious Unit = Unit Agama Spaceship part = Bagian Pesawat Antariksa Takes your religion over the one in their birth city = Memeluk agamamu dibandingkan dengan agamanya di kota kelahirannya @@ -2448,7 +2448,7 @@ upon losing at least [amount] HP in a single attack = saat kehilangan setidaknya upon ending a turn in a [tileFilter] tile = saat menyelesaikan giliran di daerah [tileFilter] upon discovering a [tileFilter] tile = saat menemukan daerah [tileFilter] hidden from users = disembunyikan dari pengguna -Comment [comment] = Komentar [comment] +Comment [comment] = [comment] Diplomatic relationships cannot change = Hubungan diplomatik tidak dapat diubah Can convert gold to science with sliders = Dapat mengonversi emas menjadi ilmu pengetahuan dengan slider Allow City States to spawn with additional units = Perbolehkan Negara-Kota untuk muncul dengan unit tambahan @@ -2586,7 +2586,7 @@ enhancing = memperkuat Our influence with City-States has started dropping faster! = Pengaruh kita dengan Negara-Kota mulai turun dengan cepat! all healing effects doubled = semua efek penyembuhan digandakan The Spaceship = Pesawat Luar Angkasa -Units ending their turn on [Mountain] tiles take [50] damage = Unit yang menyelesaikan gerakannya pada daerah [Mountain] mendapatkan [50] kerusakan +Units ending their turn on [Mountain] tiles take [50] damage = Unit yang mengakhiri gilirannya di daerah [Mountain] mendapatkan [50] kerusakan Maya Long Count calendar cycle = Siklus kalender Perhitungan Panjang Maya Triggerable = DapatDipicu UnitTriggerable = DapatDipicuUnit @@ -2638,7 +2638,7 @@ You have publicly denounced us! = Kamu telah menghina kami secara publik! You have denounced our allies = Kamu telah menghina sekutu kami You refused to stop settling cities near us = Kamu telah menolak untuk berhenti mendirikan kota di dekat kami You betrayed your promise to not settle cities near us = Kamu telah mengkhianati perjanjian untuk tidak mendirikan kota di dekat kami -Your arrogant demands are in bad taste = Tuntutan aroganmu tidak pantas. +Your arrogant demands are in bad taste = Tuntutan aroganmu tidak pantas Your use of nuclear weapons is disgusting! = Caramu menggunakan senjata nuklir itu menjijikkan! You have stolen our lands! = Kamu telah mencuri tanah kami! You destroyed City-States that were under our protection! = Kamu telah menghancurkan Negara-Kota yang berada di bawah perlindungan kami! @@ -2648,7 +2648,7 @@ You sided with a City-State over us = Kamu lebih berpihak kepada Negara-Kota dar Years of peace have strengthened our relations. = Perdamaian selama bertahun-tahun telah memperkuat hubungan kita. Our mutual military struggle brings us closer together. = Perjuangan militer kita membuat kita semakin dekat. We applaud your liberation of conquered cities! = Kami memuji usahamu dalam membebaskan kota yang telah direbut! -We have signed a public declaration of friendship = Kita telah menandatangani deklarasi pertemanan secara publik. +We have signed a public declaration of friendship = Kita telah menandatangani deklarasi pertemanan secara publik You have declared friendship with our allies = Kamu telah mendeklarasikan pertemanan dengan sekutu kami! We have signed a promise to protect each other. = Kita telah menandatangani sebuah janji untuk melindungi satu sama lain. You have declared a defensive pact with our allies = Kamu telah menyatakan pakta pertahanan dengan sekutu kita @@ -2657,8 +2657,8 @@ Our open borders have brought us closer together. = Perbatasan terbuka kita tela You fulfilled your promise to stop settling cities near us! = Kamu telah memenuhi perjanjian untuk berhenti mendirikan kota di dekat kami! You gave us units! = Kamu telah memberikan kami unit! We appreciate your gifts = Kami menghargai hadiahmu -You returned captured units to us = Kamu telah mengembalikan unit tawanan kepada kami -We believe in the same religion = Kita memiliki agama yang sama +You returned captured units to us = Kamu telah mengembalikan unit yang ditawan kepada kami +We believe in the same religion = Kita percaya dalam agama yang sama #################### Lines from key bindings ####################### @@ -2673,7 +2673,7 @@ City Screen = Layar Kota City Screen Construction Menu = Menu Pembangunan Layar Kota Popups = Popup Quit = Keluar -Deselect then Quit = Batalkan Pilihan dan Keluar +Deselect then Quit = Batalkan Pilihan lalu Keluar Menu = Menu Next Turn = Giliran Selanjutnya Next Turn Alternate = Alternatif Giliran Selanjutnya @@ -4035,7 +4035,7 @@ If my defeat is, without any doubt, the will of God, then I will accept it. = Ji God blesses those who deserve it. I am Isabel of Spain. = Tuhan memberkati mereka yang pantas diberkati. Aku Isabel dari Spanyol. I hope this deal will receive your blessing. = Aku harap penawaran ini akan mendapatkan persetujuan darimu. Seven Cities of Gold = Tujuh Kota Emas -Holy Isabella, envoy of God, Great Queen of Castille and León, your people celebrate you! Spain is a beautiful and ancient country, a link between Europe and Africa, one shore on the Mediterranean and the other on the mighty Atlantic Ocean. The Spanish culture had taken the best of the Christian and Muslim worlds, and was ready to dominate the world for centuries. Powerful Spanish military fleets and brave explorers found and conquered much of the New World. Exploiting a whole new continent and its riches, Spain reached a state of power few could compete with for hundreds of years. = Isabela yang Suci, utusan Tuhan, Ratu Agung Kastilia dan León, rakyatmu merayakanmu! Spanyol adalah negara yang cantik dan kuno, penghubung antara Eropa dan Afrika, satu pantai di Mediterania dan satunya di Samudra Atlantik yang perkasa. Kebudayaan Spanyol mengambil yang terbaik dari dunia Kristen dan Muslim, dan siap untuk mendominasi dunia selama berabad-abad. Armada militer Spanyol yang kuat dan penjelajah yang berani menemukan dan menaklukkan sebagian besar Dunia Baru. Mengeksploitasi benua yang baru dan kekayaannya, Spanyol mencapai kekuatan yang hanya dapat ditandingi oleh beberapa selama ratusan tahun. +Holy Isabella, envoy of God, Great Queen of Castille and León, your people celebrate you! Spain is a beautiful and ancient country, a link between Europe and Africa, one shore on the Mediterranean and the other on the mighty Atlantic Ocean. The Spanish culture had taken the best of the Christian and Muslim worlds, and was ready to dominate the world for centuries. Powerful Spanish military fleets and brave explorers found and conquered much of the New World. Exploiting a whole new continent and its riches, Spain reached a state of power few could compete with for hundreds of years. = Isabela yang suci, utusan Tuhan, Ratu Agung Kastilia dan León, rakyatmu merayakanmu! Spanyol adalah negara yang cantik dan kuno, penghubung antara Eropa dan Afrika, satu pantai di Mediterania dan satunya di Samudra Atlantik yang perkasa. Kebudayaan Spanyol mengambil yang terbaik dari dunia Kristen dan Muslim, dan siap untuk mendominasi dunia selama berabad-abad. Armada militer Spanyol yang kuat dan penjelajah yang berani menemukan dan menaklukkan sebagian besar Dunia Baru. Mengeksploitasi benua yang baru dan kekayaannya, Spanyol mencapai kekuatan yang hanya dapat ditandingi oleh beberapa selama ratusan tahun. O splendid and virtuous Isabella! By the will of the heavens, will Spain reborn to achieve its holy destiny and become a new El Dorado? Will your new empire shine through the ages of history? = Oh Isabela yang angkuh dan berbudi luhur! Atas kehendak surga, akankah Spanyol lahir kembali untuk mencapai tujuan sucinya dan menjadi El Dorado yang baru? Akankah kekaisaran barumu bersinar sepanjang zaman sejarah? Madrid = Madrid Barcelona = Barcelona @@ -4577,7 +4577,7 @@ squatters willing to work for you = penghuni liar berniat untuk berkerja sama de squatters wishing to settle under your rule = penghuni liar ingin tinggal di bawah kekuasaanmu An ancient tribe trained us in their ways of combat! = Sekelompok suku kuno telah melatih kita cara bertempur mereka! -your exploring unit receives training = pelatihan kepada unit yang menjelajahinya +your exploring unit receives training = unitmu yang menjelajahinya mendapatkan pelatihan We have found survivors in the ruins! Population added to [cityName]. = Kita telah menemukan penyintas di reruntuhan! Populasi ditambahkan ke [cityName]. survivors (adds population to a city) = penyintas (menambah populasi di suatu kota) @@ -4619,7 +4619,7 @@ Pottery = Tembikar 'Thou shalt not muzzle the ox when he treadeth out the corn.' - Bible Deuteronomy 25:4 = 'Janganlah engkau memberangus mulut lembu yang sedang mengirik.' - Alkitab Ulangan 25:4 Animal Husbandry = Peternakan 'The haft of the arrow has been feathered with one of the eagle's own plumes, we often give our enemies the means of our own destruction' - Aesop = 'Tangkai panah telah diberi bulu dari salah satu jambul si elang, seringkali kita memberikan musuh kita sesuatu yang membuat kita sendiri hancur' - Aesop -Archery = Pemanahan +Archery = Panahan 'The meek shall inherit the Earth, but not its mineral rights.' - J. Paul Getty = 'Orang yang lemah lembut adalah pewaris bumi, tetapi tidak dengan hak mineralnya.' - J. Paul Getty Mining = Pertambangan @@ -4746,7 +4746,7 @@ Atomic Theory = Teori Atom 'Only within the moment of time represented by the present century has one species, man, acquired significant power to alter the nature of his world.' - Rachel Carson = 'Hanya dalam momen waktu yang direpresentasikan abad ini suatu spesies, manusia, telah menerima kuasa yang signifikan untuk mengubah alam dari dunianya sendiri.' - Rachel Carson Ecology = Ekologi -'Computers are like Old Testament gods: lots of rules and no mercy.' - Joseph Campbell = 'Komputer adalah seperti Tuhan di Perjanjian Lama: banyak aturan dan tanpa belas kasihan.' - Joseph Campbell +'Computers are like Old Testament gods: lots of rules and no mercy.' - Joseph Campbell = 'Komputer bagaikan dewa-dewa di Perjanjian Lama: banyak aturan dan tanpa belas kasihan.' - Joseph Campbell Computers = Komputer 'A good rule for rocket experimenters to follow is this: always assume that it will explode.' - Astronautics Magazine, 1937 = 'Kaidah yang baik untuk mereka yang bereksperimen dalam peroketan adalah ini: selalu berasumsi bahwa roket akan meledak.' - Majalah Astronautics, 1937 Rocketry = Peroketan @@ -5259,7 +5259,7 @@ Companion Cavalry = Kavaleri Kompani Catapult = Katapel Tempur -Ballista = Balista +Ballista = Ballista Swordsman = Prajurit Berpedang @@ -5578,7 +5578,7 @@ Alhambra = Alhambra Ceilidh Hall = Aula Ceilidh -Constabulary = Satuan Pengamanan +Constabulary = Kepolisian Leaning Tower of Pisa = Menara Miring Pisa @@ -5591,7 +5591,7 @@ Coffee House = Warung Kopi Police Station = Kantor Polisi -National Intelligence Agency = Badan Intelijen Negara +National Intelligence Agency = Badan Intelijen Nasional Neuschwanstein = Neuschwanstein @@ -6064,7 +6064,7 @@ Maria Theresa = Maria Theresa Shame that it has come this far. But ye wished it so. Next time, be so good, choose your words more wisely. = Sayang sekali karena kita sudah sampai pada titik ini. Tetapi ini keinginanmu. Lain kali, jadilah lebih baik, pilihlah dengan lebih bijak kata-katamu. What a fool ye are! Ye will end swiftly and miserably. = Betapa bodohnya dirimu! Engkau akan berakhir sebentar lagi dengan menyedihkan. The world is pitiful! There's no beauty in it, no wisdom. I am almost glad to go. = Dunia ini sangat malang! Tidak ada yang indah di dalamnya, tidak ada kearifan. Saya cukup senang untuk meninggalkannya. -The archduchess of Austria welcomes your Eminence to... Oh let's get this over with! I have a luncheon at four o'clock. = Putri Agung Austria menyambut Yang Mulia ke... Oh sudahilah saja ini! Aku ada pertemuan makan siang pukul empat. +The archduchess of Austria welcomes your Eminence to... Oh let's get this over with! I have a luncheon at four o'clock. = Adipati agung Austria menyambut Yang Mulia ke... Oh sudahilah saja ini! Aku ada pertemuan makan siang pukul empat. I see you admire my new damask. Nobody should say that I am an unjust woman. Let's reach an agreement! = Aku lihat kamu mengagumi kain damask baruku. Tidak ada yang boleh bilang bahwa saya adalah wanita yang tidak adil. Mari kita capai sebuah kesepakatan! Oh, it's ye! = Oh, itu kamu! Diplomatic Marriage = Pernikahan Diplomatik @@ -6846,7 +6846,7 @@ 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. = Huruf dapat memilih kategori, dan bila ada beberapa kategori yang cocok dengan huruf yang sama, kamu dapat menekannya berulang kali untuk menggilirnya. The arrow keys allow navigation as well - left/right for categories, up/down for entries. = Tombol panah juga memungkinkan navigasi - kiri/kanan untuk kategori, atas/bawah untuk entri. -UI Tips = Tip UI +UI Tips = Tips UI World screen = Layar dunia Skip all units to end a turn quickly = Lewati semua unit untuk mengakhiri giliran secepatnya Right-click or long press the "Next unit" button to open a popup menu which allows to end a turn without having to cycle through all units. If some units are automated, a dedicated button is available to move them before ending the turn. = Klik kanan atau tekan lama tombol "Unit selanjutnya" untuk membuka menu popup yang memperbolehkan untuk mengakhiri giliran tanpa harus melewati seluruh unit. Jika beberapa unit diotomatisasi, sebuah tombol yang didedikasikan tersedia untuk menggerakkan mereka sebelum mengakhiri giliran. diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 125e663686..35173ba669 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -75,16 +75,11 @@ Hydro Plant = Centrale idroelettrica # City naming when list exhausted - # Requires translation! -New [cityName] = - # Requires translation! -Neo [cityName] = - # Requires translation! -Nova [cityName] = - # Requires translation! -Altera [cityName] = - # Requires translation! -New [civName]\n(formerly known as [cityName]) = +New [cityName] = Nuova [cityName] +Neo [cityName] = Neo [cityName] +Nova [cityName] = Nova [cityName] +Altera [cityName] = Altera [cityName] +New [civName]\n(formerly known as [cityName]) = Nuova [civName]\n(ex [cityName]) # Diplomacy,Trade,Nations @@ -160,21 +155,14 @@ Denounce ([numberOfTurns] turns) = Denuncia ([numberOfTurns] turni) We will remember this. = Non credere che ce lo scorderemo! [civName] has declared war on [targetCivName]! = [civName] ha dichiarato guerra a [targetCivName]! - # Requires translation! -[civName] has joined [allyCivName] in the war against us! = - # Requires translation! -We have joined [allyCivName] in the war against [enemyCivName]! = - # Requires translation! -[civName] has joined [allyCivName] in the war against [enemyCivName]! = - # Requires translation! -[civName] has joined us in the war against [enemyCivName]! = +[civName] has joined [allyCivName] in the war against us! = [civName] si è unita a [allyCivName] nella guerra contro di noi! +We have joined [allyCivName] in the war against [enemyCivName]! = Ci siamo uniti a [allyCivName] nella guerra contro [enemyCivName]! +[civName] has joined [allyCivName] in the war against [enemyCivName]! = [civName] si è unita a [allyCivName] nella guerra contro [enemyCivName]! +[civName] has joined us in the war against [enemyCivName]! = [civName] si è unita a noi nella guerra con [enemyCivName]! - # Requires translation! -[civName] cancelled their Defensive Pact with [otherCivName]! = - # Requires translation! -[civName] cancelled their Defensive Pact with us! = - # Requires translation! -We have cancelled our Defensive Pact with [civName]! = +[civName] cancelled their Defensive Pact with [otherCivName]! = [civName] ha cancellato il suo accordo di difesa con [otherCivName]! +[civName] cancelled their Defensive Pact with us! = [civName] ha cancellato il suo accordo di difesa con noi! +We have cancelled our Defensive Pact with [civName]! = Il nostro accordo di difesa con [civName] è finito! [civName] and [targetCivName] have signed a Peace Treaty! = [civName] ha firmato una pace con [targetCivName]! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] e [targetCivName] hanno stretto una Dichiarazione d'Amicizia! @@ -1561,8 +1549,7 @@ My friend, shall we declare our friendship to the world? = Piantiamo i semi di u Sign Declaration of Friendship ([30] turns) = Firma Dichiarazione di Amicizia ([30] turni) We are not interested. = Questo accordo non ci interessa. We have signed a Declaration of Friendship with [otherCiv]! = Abbiamo stretto una Dichiarazione di Amicizia con [otherCiv]! - # Requires translation! -[civName] and [otherCivName] have signed a Defensive Pact! = +[civName] and [otherCivName] have signed a Defensive Pact! = [civName] e [otherCivName] hanno segnato un Accordo di Difesa! [otherCiv] has denied our Declaration of Friendship! = [otherCiv] ha rifiutato la nostra Dichiarazione di Amicizia. Basics = Basi diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 2a7fc7ab79..b6b3269c6d 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -19,8 +19,7 @@ Fastlane_short_description = Jogo 4X de construção de civilizações open sour # 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 = +Fastlane_full_description = Uma reimplementação open-source do jogo mais famoso de construção de civilizações de sempre - rápido, pequeno, sem anúncios, grátis para sempre!\n\nConstrói a tua civilização, pesquisa tecnologias, expande as tuas cidades e derrota os teus inimigos!\n\nPedidos? Bugs? Quer ajudar no desenvolvimento? A lista de tarefas para a aplicação é https://github.com/yairm210/Unciv/issues\n\nPerguntas? Comentários? Junta-te ao nosso discord em https://discord.gg/bjrB4Xw ;)\n\nQuer ajudar a traduzir o jogo para a sua língua? Ver https://yairm210.github.io/Unciv/Other/Translating/\n\nO mundo está à espera! Conseguirás transformar a tua civilização num império que resistirá a prova do tempo?\n\nA permissão “ter acesso total à rede” é necessária para transferências iniciadas pelo utilizador e para a funcionalidade multijogador. Todas as outras permissões listadas são incluídas automaticamente pela API utilizada para implementar as notificações de turno multijogador. As permissões de rede são usadas para listar mods, descarregar mods, descarregar música e para carregar/descarregar jogos multijogador. A Unciv não inicia qualquer outra comunicação com a Internet. # Starting from here normal translations start, as described in @@ -76,16 +75,11 @@ Hydro Plant = Central hidroelétrica # City naming when list exhausted - # Requires translation! -New [cityName] = - # Requires translation! -Neo [cityName] = - # Requires translation! -Nova [cityName] = - # Requires translation! -Altera [cityName] = - # Requires translation! -New [civName]\n(formerly known as [cityName]) = +New [cityName] = Nova [cityName] +Neo [cityName] = Neo [cityName] +Nova [cityName] = Nova [cityName] +Altera [cityName] = Altera [cityName] +New [civName]\n(formerly known as [cityName]) = Nova [civName]\n(anteriormente conhecido como [cityName]) # Diplomacy,Trade,Nations @@ -161,21 +155,14 @@ Denounce ([numberOfTurns] turns) = Condenar ([numberOfTurns] turnos) We will remember this. = Nós nos lembraremos disto. [civName] has declared war on [targetCivName]! = [civName] declarou guerra a [targetCivName]! - # Requires translation! -[civName] has joined [allyCivName] in the war against us! = - # Requires translation! -We have joined [allyCivName] in the war against [enemyCivName]! = - # Requires translation! -[civName] has joined [allyCivName] in the war against [enemyCivName]! = - # Requires translation! -[civName] has joined us in the war against [enemyCivName]! = +[civName] has joined [allyCivName] in the war against us! = [civName] juntou-se a [allyCivName] na guerra contra nós! +We have joined [allyCivName] in the war against [enemyCivName]! = Juntámo-nos a [allyCivName] na guerra contra [enemyCivName]! +[civName] has joined [allyCivName] in the war against [enemyCivName]! = [civName] juntou-se a [allyCivName] na guerra contra [enemyCivName]! +[civName] has joined us in the war against [enemyCivName]! = [civName] juntou-se a nós na guerra contra [enemyCivName]! - # Requires translation! -[civName] cancelled their Defensive Pact with [otherCivName]! = - # Requires translation! -[civName] cancelled their Defensive Pact with us! = - # Requires translation! -We have cancelled our Defensive Pact with [civName]! = +[civName] cancelled their Defensive Pact with [otherCivName]! = [civName] cancelou o seu Pacto Defensivo com [otherCivName]! +[civName] cancelled their Defensive Pact with us! = [civName] cancelou o seu Pacto Defensivo connosco! +We have cancelled our Defensive Pact with [civName]! = Cancelámos o nosso Pacto Defensivo com o [civName]! [civName] and [targetCivName] have signed a Peace Treaty! = [civName] e [targetCivName] assinaram um Tratado de Paz! [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] e [targetCivName] assinaram a Declaração de Amizade! @@ -1131,8 +1118,7 @@ Range = Alcance XP = Experiência Move unit = Mover a unidade Stop movement = Parar o movimento - # Requires translation! -Show unit destination = +Show unit destination = Mostrar destino da unidade Swap units = Trocar unidades Construct improvement = Construir uma melhoria Automate = Automatizar @@ -1563,8 +1549,7 @@ My friend, shall we declare our friendship to the world? = Meu amigo, devemos de Sign Declaration of Friendship ([30] turns) = Assinar Declaração de Amizade ([30] turnos) We are not interested. = Nós não estamos interessados. We have signed a Declaration of Friendship with [otherCiv]! = Nós assinamos uma Declaração de Amizade com [otherCiv]! - # Requires translation! -[civName] and [otherCivName] have signed a Defensive Pact! = +[civName] and [otherCivName] have signed a Defensive Pact! = [civName] e [otherCivName] assinaram um Pacto Defensivo! [otherCiv] has denied our Declaration of Friendship! = [otherCiv] negou nossa Declaração de Amizade! Basics = Básicos @@ -1685,26 +1670,16 @@ Units: = Unidades: Unit types = Tipos de unidade Domain: [param] = Domínio: [param] Toggle UI (World Screen only) = Mostrar/Ocultar UI (Apenas no ecrã do mundo) - # Requires translation! -Overrides yields from underlying terrain = - # Requires translation! -No yields = - # Requires translation! -Mod: [modname] = - # Requires translation! -Search text: = - # Requires translation! -Invalid regular expression = - # Requires translation! -Mod filter: = - # Requires translation! --Combined- = - # Requires translation! -Search! = - # Requires translation! -Results = - # Requires translation! -Nothing found! = +Overrides yields from underlying terrain = Substitui os rendimentos do terreno subjacente +No yields = Sem rendimentos +Mod: [modname] = Mod: [modname] +Search text: = Pesquisar texto: +Invalid regular expression = Expressão regular inválida +Mod filter: = Filtro de Mod: +-Combined- = -Combinado- +Search! = Pesquisar! +Results = Resultados +Nothing found! = Nada encontrado! # Policies @@ -1719,8 +1694,7 @@ Adopt free policy = Adotar Política livre Unlocked at = Desbloqueado em Gain 2 free technologies = Ganha 2 tecnologias grátis All policies adopted = Todas as políticas adotadas - # Requires translation! -[branchName] branch = +[branchName] branch = [branchName] ramo Policy branch: [branchName] = Ramo da política: [branchName] Are you sure you want to adopt [branchName]? = Tens a certeza que queres adotar [branchName]? @@ -1758,20 +1732,13 @@ Followers of this religion: = Seguidores desta religião: Click an icon to see the stats of this religion = Clica num ícone para ver as estatísticas desta religião Religion: Off = Religião: Desligada Minimal Faith required for\nthe next [Great Prophet]: = Fé mínima necessária para\npróximo [Great Prophet]: - # Requires translation! -Religions to be founded: [amount] = - # Requires translation! -Available religion symbols = - # Requires translation! -Number of civilizations * [amount] + [amount2] = - # Requires translation! -Estimated Number of civilizations * [amount] + [amount2] = - # Requires translation! -Religions already founded = - # Requires translation! -Available founder beliefs = - # Requires translation! -Available follower beliefs = +Religions to be founded: [amount] = Religiões a fundar: [amount] +Available religion symbols = Símbolos religiosos disponíveis +Number of civilizations * [amount] + [amount2] = Número de civilizações * [amount] + [amount2] +Estimated Number of civilizations * [amount] + [amount2] = Estimado Número de civilizações * [amount] + [amount2] +Religions already founded = Religiões já fundadas +Available founder beliefs = Crenças do fundador disponíveis +Available follower beliefs = Crenças de seguidores disponíveis Religious status: = Estado religioso: None = Nenhum @@ -1792,10 +1759,8 @@ Move = Mover After an unknown civilization entered the [eraName], we have recruited [spyName] as a spy! = Depois de uma civilização desconhecida entrar na [eraName], nós recrutamos [spyName] como espião! We have recruited [spyName] as a spy! = Nós recrutamos [spyName] como espião! - # Requires translation! -Your spy [spyName] has leveled up! = - # Requires translation! -Your spy [spyName] cannot steal any more techs from [civName] as we've already researched all the technology they know! = +Your spy [spyName] has leveled up! = O teu espião [spyName] subiu de nível! +Your spy [spyName] cannot steal any more techs from [civName] as we've already researched all the technology they know! = O teu espião [spyName] não pode roubar mais tecnologias de [civName] porque já investigámos toda a tecnologia que eles conhecem! # Stealing Technology defending civ # Requires translation! @@ -1845,8 +1810,7 @@ Dogfighting III = Combate Áereo III Choose name for [unitName] = Ecolhe um nome para o [unitName] [unitFilter] units gain the [promotion] promotion = Unidades [unitFilter] ganham a promoção [promotion] Requires = Precisa - # Requires translation! -Path to [promotion] is ambiguous = +Path to [promotion] is ambiguous = O caminho para [promotion] é ambíguo # Multiplayer Turn Checker Service @@ -1883,14 +1847,10 @@ Download [modName] = Transferir [modName] Update [modName] = Atualizar [modName] Could not download mod list = Não foi possível tranferir a lista de mods Download mod from URL = Transferir o mod através de URL - # Requires translation! -Please enter the mod repository -or- archive zip -or- branch -or- release url: = - # Requires translation! -That is not a valid ZIP file = - # Requires translation! -Invalid Mod archive structure = - # Requires translation! -Invalid link! = +Please enter the mod repository -or- archive zip -or- branch -or- release url: = Por favor introduza o URL do repositório mod -ou- archive zip -ou- branch -ou- release: +That is not a valid ZIP file = Este ficheiro ZIP não é válido +Invalid Mod archive structure = Estrutura inválida do arquivo do Mod +Invalid link! = Link inválido! Paste from clipboard = Colar da área de transferência Download = Transferir Done! = Feito! @@ -1912,22 +1872,18 @@ Mods of mods = Mods de mods Mod info and options = Informação e opções do mod Next page = Próxima Página Open Github page = Abrir a página do Github - # Requires translation! -Link copied to clipboard = +Link copied to clipboard = Link copiado para a área de transferência Permanent audiovisual mod = Mod audiovisual permanente Installed = Instalado Downloaded! = Transferido! [modName] Downloaded! = [modName] Transferido! Could not download [modName] = Não foi possível trasferir [modName] Online query result is incomplete = O resultado da consulta online está incompleto - # Requires translation! -Sorting and filtering needs to wait until the online query finishes = +Sorting and filtering needs to wait until the online query finishes = A ordenação e a filtragem têm de esperar até que a consulta online termine No description provided = Sem descrição [stargazers]✯ = [stargazers]✯ Author: [author] = Criador: [author] -Size: [size] kB = Tamanho: [size] kB - # Requires translation! -Size: [size] MB = +Size: [size] MB = Tamanho: [size] MB The mod you selected is incompatible with the defined ruleset! = O mod que selecionaste é incompatível com o conjunto de regras definido! Sort and Filter = Ordenar e Filtrar Enter search text = Insira o texto de pesquisa @@ -1940,12 +1896,9 @@ Date ￬ = Data ￬ Stars ￬ = Estrelas ￬ Status ￬ = Estado ￬ - # Requires translation! -Scenarios = - # Requires translation! -Error loading scenario: = - # Requires translation! -Choose scenario = +Scenarios = Cenários +Error loading scenario: = Erro ao carregar o cenário: +Choose scenario = Selecionar cenário # Uniques that are relevant to more than one type of game object @@ -1991,8 +1944,7 @@ Unit [unitName] doesn't seem to exist! = Unidade [unitName] não existe! # Example: In the unique "+20% Strength ", should the # be translated before or after the "+20% Strength"? - # Requires translation! -ConditionalsPlacement = +ConditionalsPlacement = after # The second determines the exact ordering of all conditionals that are to be translated. # ALL conditionals that exist will be part of this line, and they may be moved around and rearranged as you please. @@ -2014,22 +1966,19 @@ ConditionalsPlacement = #################### Lines from Unique Types ####################### - # Requires translation! -[stats] = +[stats] = [stats] [stats] [cityFilter] = [stats] [cityFilter] [stats] from every specialist [cityFilter] = [stats] de cada especialista [cityFilter] [stats] per [amount] population [cityFilter] = [stats] por [amount] população [cityFilter] [stats] per [amount] social policies adopted = [stats] por [amount] políticas sociais adotadas - # Requires translation! -[stats] per every [amount] [civWideStat] = +[stats] per every [amount] [civWideStat] = [stats] por cada [amount] [civWideStat] [stats] in cities on [terrainFilter] tiles = [stats] em cidades em [terrainFilter] blocos [stats] from all [buildingFilter] buildings = [stats] de todos os edifícios [buildingFilter] [stats] from [tileFilter] tiles [cityFilter] = [stats] de [tileFilter] blocos [cityFilter] [stats] from [tileFilter] tiles without [tileFilter2] [cityFilter] = [stats] de [tileFilter] blocos sem [tileFilter2] [cityFilter] [stats] from each Trade Route = [stats] de cada Tota Comercial [stats] for each global city following this religion = [stats] para cada cidade global que segue esta religião - # Requires translation! -[stats] from every [amount] global followers [cityFilter] = +[stats] from every [amount] global followers [cityFilter] = [stats] por cada [amount] seguidores globais [cityFilter] [relativeAmount]% [stat] = [relativeAmount]% [stat] [relativeAmount]% [stat] [cityFilter] = [relativeAmount]% [stat] [cityFilter] [relativeAmount]% [stat] from every [tileFilter/buildingFilter] = [relativeAmount]% [stat] de cada [tileFilter/buildingFilter] @@ -2037,10 +1986,8 @@ ConditionalsPlacement = [relativeAmount]% [stat] from every follower, up to [relativeAmount2]% = [relativeAmount2]% [stat] de cada seguidor, até [relativeAmount]% [relativeAmount]% [stat] from City-States = [relativeAmount]% [stat] de Cidades-Estado [relativeAmount]% [stat] from Trade Routes = [relativeAmount]% [stat] de Rotas Comerciais - # Requires translation! -Nullifies [stat] [cityFilter] = - # Requires translation! -Nullifies Growth [cityFilter] = +Nullifies [stat] [cityFilter] = Anula [stat] [cityFilter] +Nullifies Growth [cityFilter] = Anula Crescimento [cityFilter] [relativeAmount]% Production when constructing [buildingFilter] buildings [cityFilter] = [relativeAmount]% Produção ao construir [buildingFilter] edifícios [cityFilter] [relativeAmount]% Production when constructing [baseUnitFilter] units [cityFilter] = [relativeAmount]% Produção quando constrói unidades [baseUnitFilter] [cityFilter] [relativeAmount]% Production when constructing [buildingFilter] wonders [cityFilter] = [relativeAmount]% Produção quando constrói maravilhas [buildingFilter] [cityFilter] diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index e6a7014a64..a809d182cf 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 = 991 - const val appVersion = "4.11.7-patch1" + const val appCodeNumber = 992 + const val appVersion = "4.11.8" const val gdxVersion = "1.12.1" const val ktorVersion = "2.2.3" diff --git a/changelog.md b/changelog.md index a10ec07282..c475146f7c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,33 @@ +## 4.11.8 + +Perf: Yet more caching ruleset objects' filter results + +Perf: Minor hotspot when you have many invisible-unit detectors + +Civilian AI wandering avoids enemy melee units correctly + +Perf: RequiresResource -> RequiredResources, for CivInfo.setTransients memory performance + +Perf: memory optimizations + +selectedCiv instead of currentCiv, so spectators get a view like the civ they're spectating as + +Color city centers differently on max zoom out, like in minimap + +Color lands by owner on max zoom out, for better overview + +Resolved - MP Spectator can scroll entire map + +4.11.7-patch1 + +Don't use tileRemovals for ruleset validation check, since we edit the ruleset as we go in the new game screen, so the tileRemovals is not accurate once mods are changed + +Resolved - Safeguard against uniques specifying non-existant promotions + +Fix: Android pause/resume cycle not working - By SomeTroglodyte + +Fixed problem with selecting city constructions option and AutoPlay - By tuvus + ## 4.11.7 By tuvus: diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 7a01ff0b32..aaa9beae5d 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.11.7-patch1", 991) + val VERSION = Version("4.11.8", 992) //endregion lateinit var Current: UncivGame diff --git a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt index 4f7e9d62cf..dce9fdf523 100644 --- a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt +++ b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt @@ -12,7 +12,11 @@ import com.unciv.models.ruleset.RejectionReason import com.unciv.models.ruleset.RejectionReasonType import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.RulesetObject -import com.unciv.models.ruleset.unique.* +import com.unciv.models.ruleset.unique.StateForConditionals +import com.unciv.models.ruleset.unique.Unique +import com.unciv.models.ruleset.unique.UniqueTarget +import com.unciv.models.ruleset.unique.UniqueType +import com.unciv.models.ruleset.unique.Conditionals import com.unciv.models.stats.Stat import com.unciv.ui.components.extensions.getNeedMoreAmountString import com.unciv.ui.components.extensions.toPercent diff --git a/fastlane/metadata/android/en-US/changelogs/992.txt b/fastlane/metadata/android/en-US/changelogs/992.txt new file mode 100644 index 0000000000..98440c1caf --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/992.txt @@ -0,0 +1,29 @@ + + +Perf: Yet more caching ruleset objects' filter results + +Perf: Minor hotspot when you have many invisible-unit detectors + +Civilian AI wandering avoids enemy melee units correctly + +Perf: RequiresResource -> RequiredResources, for CivInfo.setTransients memory performance + +Perf: memory optimizations + +selectedCiv instead of currentCiv, so spectators get a view like the civ they're spectating as + +Color city centers differently on max zoom out, like in minimap + +Color lands by owner on max zoom out, for better overview + +Resolved - MP Spectator can scroll entire map + +4.11.7-patch1 + +Don't use tileRemovals for ruleset validation check, since we edit the ruleset as we go in the new game screen, so the tileRemovals is not accurate once mods are changed + +Resolved - Safeguard against uniques specifying non-existant promotions + +Fix: Android pause/resume cycle not working - By SomeTroglodyte + +Fixed problem with selecting city constructions option and AutoPlay - By tuvus \ No newline at end of file