From 33a164c322c7fe186886225926eec29a499031ab Mon Sep 17 00:00:00 2001 From: yairm210 Date: Thu, 8 Aug 2024 15:11:40 +0300 Subject: [PATCH] 4.12.18 --- .../jsons/translations/Afrikaans.properties | 4 ++ .../jsons/translations/Bangla.properties | 4 ++ .../jsons/translations/Belarusian.properties | 4 ++ .../jsons/translations/Bosnian.properties | 4 ++ .../Brazilian_Portuguese.properties | 4 ++ .../jsons/translations/Bulgarian.properties | 4 ++ .../jsons/translations/Catalan.properties | 4 ++ .../jsons/translations/Czech.properties | 4 ++ .../jsons/translations/Dutch.properties | 4 ++ .../jsons/translations/English.properties | 4 ++ .../jsons/translations/Filipino.properties | 4 ++ .../jsons/translations/Finnish.properties | 4 ++ .../jsons/translations/French.properties | 6 ++- .../jsons/translations/Galician.properties | 4 ++ .../jsons/translations/German.properties | 4 ++ .../jsons/translations/Greek.properties | 4 ++ .../jsons/translations/Hungarian.properties | 4 ++ .../jsons/translations/Indonesian.properties | 9 ++-- .../jsons/translations/Italian.properties | 4 ++ .../jsons/translations/Japanese.properties | 34 +++---------- .../jsons/translations/Korean.properties | 4 ++ .../jsons/translations/Latin.properties | 4 ++ .../jsons/translations/Lithuanian.properties | 4 ++ .../jsons/translations/Malay.properties | 4 ++ .../jsons/translations/Norwegian.properties | 4 ++ .../Persian_(Pinglish-DIN).properties | 4 ++ .../Persian_(Pinglish-UN).properties | 4 ++ .../jsons/translations/Polish.properties | 4 ++ .../jsons/translations/Portuguese.properties | 4 ++ .../jsons/translations/Romanian.properties | 4 ++ .../jsons/translations/Russian.properties | 4 ++ .../jsons/translations/Rusyn.properties | 4 ++ .../Simplified_Chinese.properties | 4 ++ .../jsons/translations/Spanish.properties | 4 ++ .../jsons/translations/Swedish.properties | 4 ++ .../Traditional_Chinese.properties | 4 ++ .../jsons/translations/Turkish.properties | 4 ++ .../jsons/translations/Ukrainian.properties | 12 ++--- .../jsons/translations/Vietnamese.properties | 4 ++ .../assets/jsons/translations/Zulu.properties | 4 ++ .../completionPercentages.properties | 2 +- changelog.md | 46 +++-------------- .../multiplayerscreens/MultiplayerScreen.kt | 29 +++++------ .../android/en-US/changelogs/1035.txt | 50 +++---------------- 44 files changed, 191 insertions(+), 141 deletions(-) diff --git a/android/assets/jsons/translations/Afrikaans.properties b/android/assets/jsons/translations/Afrikaans.properties index 6efd542ccb..74784bc593 100644 --- a/android/assets/jsons/translations/Afrikaans.properties +++ b/android/assets/jsons/translations/Afrikaans.properties @@ -2291,6 +2291,8 @@ Status = # Requires translation! Current turn = # Requires translation! +You = + # Requires translation! Turn [turnNumber] = # Requires translation! Location = @@ -4246,6 +4248,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Bangla.properties b/android/assets/jsons/translations/Bangla.properties index e9d6f95e3d..15208e6e32 100644 --- a/android/assets/jsons/translations/Bangla.properties +++ b/android/assets/jsons/translations/Bangla.properties @@ -1909,6 +1909,8 @@ Somewhere around [city] = [city] এর আশেপাশে কোথাও Far away = দূরবর্তী Status = অবস্থা Current turn = বর্তমান চাল + # Requires translation! +You = Turn [turnNumber] = চাল [turnNumber] Location = অবস্থান Unimproved = অনুন্নত @@ -3858,6 +3860,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Belarusian.properties b/android/assets/jsons/translations/Belarusian.properties index 06e1846138..230d45078d 100644 --- a/android/assets/jsons/translations/Belarusian.properties +++ b/android/assets/jsons/translations/Belarusian.properties @@ -1982,6 +1982,8 @@ Status = # Requires translation! Current turn = # Requires translation! +You = + # Requires translation! Turn [turnNumber] = # Requires translation! Location = @@ -3905,6 +3907,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Bosnian.properties b/android/assets/jsons/translations/Bosnian.properties index 28cf1005a4..6b675d2ead 100644 --- a/android/assets/jsons/translations/Bosnian.properties +++ b/android/assets/jsons/translations/Bosnian.properties @@ -2525,6 +2525,8 @@ Status = # Requires translation! Current turn = # Requires translation! +You = + # Requires translation! Turn [turnNumber] = # Requires translation! Location = @@ -4480,6 +4482,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 509d11aee2..0dcb0d249f 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -1478,6 +1478,8 @@ Somewhere around [city] = Algum lugar perto de [city] Far away = Distante Status = Status Current turn = Turno atual + # Requires translation! +You = Turn [turnNumber] = Turno [turnNumber] Location = Localização Unimproved = Não aprimorado @@ -2510,6 +2512,8 @@ Should only be used as permanent audiovisual mod = Deve ser usado apenas como mo Can be used as permanent audiovisual mod = Pode ser usado como mod audiovisual permanente Cannot be used as permanent audiovisual mod = Não pode ser usado como mod audiovisual permanente Mod preselects map [comment] = Mod pré-seleciona mapa [comment] + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties index 8779c3595b..74504ab767 100644 --- a/android/assets/jsons/translations/Bulgarian.properties +++ b/android/assets/jsons/translations/Bulgarian.properties @@ -1759,6 +1759,8 @@ Somewhere around [city] = Някъде около [city] Far away = Далеч Status = Статус Current turn = Текущ ход + # Requires translation! +You = Turn [turnNumber] = Ход [turnNumber] Location = Местоположение Unimproved = Неподобрен @@ -3569,6 +3571,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties index 65ac9f29c1..597b3eb21e 100644 --- a/android/assets/jsons/translations/Catalan.properties +++ b/android/assets/jsons/translations/Catalan.properties @@ -1472,6 +1472,8 @@ Somewhere around [city] = En algun lloc pels voltants de [city] Far away = Molt lluny Status = Estat Current turn = Torn actual + # Requires translation! +You = Turn [turnNumber] = Torn [turnNumber] Location = Ubicació Unimproved = Sense millorar @@ -2503,6 +2505,8 @@ Should only be used as permanent audiovisual mod = Només es pot fer servir com Can be used as permanent audiovisual mod = Es pot fer servir com a mod audiovisual permanent Cannot be used as permanent audiovisual mod = No es pot fer servir com a mod audiovisual permanent Mod preselects map [comment] = El mod preselecciona el mapa [comment] + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index ec404549b9..85d1e0f0e8 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -1521,6 +1521,8 @@ Status = Stav # Requires translation! Current turn = # Requires translation! +You = + # Requires translation! Turn [turnNumber] = Location = Pozice # Requires translation! @@ -2956,6 +2958,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 8d6fb6b000..06552e078c 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -1516,6 +1516,8 @@ Somewhere around [city] = Rondom [city] Far away = Ver weg Status = Status Current turn = Huidige beurt + # Requires translation! +You = Turn [turnNumber] = Beurt [turnNumber] Location = Locatie Unimproved = Ongewijzigd @@ -2630,6 +2632,8 @@ Can be used as permanent audiovisual mod = Kan gebruikt worden als een permanent Cannot be used as permanent audiovisual mod = Kan niet gebruikt worden als een permanente audiovisuele mod # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index c5aab6370f..53fd2c7e45 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -2716,6 +2716,8 @@ Status = # Requires translation! Current turn = # Requires translation! +You = + # Requires translation! Turn [turnNumber] = # Requires translation! Location = @@ -4672,6 +4674,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties index 707979f2ee..9389fe39f7 100644 --- a/android/assets/jsons/translations/Filipino.properties +++ b/android/assets/jsons/translations/Filipino.properties @@ -1540,6 +1540,8 @@ Somewhere around [city] = Sa paligid ng [city] Far away = Malayo Status = Katayuan Current turn = Kasalukuyang turno + # Requires translation! +You = Turn [turnNumber] = Turno [turnNumber] Location = Lokasyon Unimproved = Hindi pinagbuti @@ -2689,6 +2691,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index c1d93466a3..1f29c93e38 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -1901,6 +1901,8 @@ Status = Tila # Requires translation! Current turn = # Requires translation! +You = + # Requires translation! Turn [turnNumber] = Location = Sijainti Unimproved = Kehittämättä @@ -3699,6 +3701,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index e52f25ad68..db934bafdf 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -257,7 +257,6 @@ City-States grow wary of your aggression. The resting point for Influence has de [cityState] is being attacked by [civName]! Kill [amount] of the attacker's military units and they will be immensely grateful. = [cityState] est attaquée par [civName] ! Tuez [amount] unité(s) de l'armée attaquante et elle vous en sera immensément reconnaissante. [cityState] is deeply grateful for your assistance in the war against [civName]! = [cityState] est profondément reconnaissante de votre aide dans la guerre contre [civName] ! [cityState] no longer needs your assistance against [civName]. = [cityState] n'a plus besoin de votre aide contre [civName]. - # Requires translation! [cityState] cancelled the quests they had given you because you demanded tribute from them. = [cityState] a annulé les quêtes qu'elle vous avait confiées car vous lui avez réclamé un tribut. War against [civName] = Guerre contre [civName] We need you to help us defend against [civName]. Killing [amount] of their military units would slow their offensive. = Nous avons besoin de votre aide pour nous défendre contre [civName]. Tuer [amount] de leurs unités militaires devrait ralentir leur offensive. @@ -1033,7 +1032,6 @@ You and [name] are no longer allies! = Vous et [name] n'êtes plus alliés ! [civName] has denounced us! = [civName] nous a dénoncé ! [cityName] has been connected to your capital! = [cityName] est connectée à votre capitale ! [cityName] has been disconnected from your capital! = [cityName] n'est plus connectée à votre capitale ! - # Requires translation! Connect road completed = Connexion routière terminée [civName] has accepted your trade request = [civName] a accepté notre offre d'échange [civName] has made a counteroffer to your trade request = [civName] a proposé une contre-offre à votre offre d'échange @@ -1470,6 +1468,8 @@ Somewhere around [city] = Quelque part autour de [city] Far away = Très loin Status = Statut Current turn = Tour en cours + # Requires translation! +You = Turn [turnNumber] = Tour [turnNumber] Location = Lieu Unimproved = Non-aménagées @@ -2498,6 +2498,8 @@ Should only be used as permanent audiovisual mod = Devrait être activé uniquem Can be used as permanent audiovisual mod = Peut être activé comme mod audiovisuel permanent Cannot be used as permanent audiovisual mod = Ne peut pas être activé comme mod audiovisuel permanent Mod preselects map [comment] = Le mod utilise la carte [comment] + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Galician.properties b/android/assets/jsons/translations/Galician.properties index 96877d5d40..33c521cb6f 100644 --- a/android/assets/jsons/translations/Galician.properties +++ b/android/assets/jsons/translations/Galician.properties @@ -1479,6 +1479,8 @@ Somewhere around [city] = Nalgún lugar preto de [city] Far away = Lonxe Status = Estado Current turn = Quenda actual + # Requires translation! +You = Turn [turnNumber] = Quenda [turnNumber] Location = Localización Unimproved = Sen mellorar @@ -2513,6 +2515,8 @@ Should only be used as permanent audiovisual mod = Só se debe usar como mod aud Can be used as permanent audiovisual mod = Pódese usar como mod audiovisual permanente Cannot be used as permanent audiovisual mod = Non se pode usar como mod audiovisual permanente Mod preselects map [comment] = Mod preselecciona mapa [comment] + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 18ff20a4a0..978c9ae856 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -1468,6 +1468,8 @@ Somewhere around [city] = In der Nähe von [city] Far away = Weit entfernt Status = Status Current turn = Aktuelle Runde + # Requires translation! +You = Turn [turnNumber] = Runde [turnNumber] Location = Standort Unimproved = Unverbessert @@ -2496,6 +2498,8 @@ Should only be used as permanent audiovisual mod = Sollte nur als permanente aud Can be used as permanent audiovisual mod = Kann als permanente audiovisuelle Mod verwendet werden Cannot be used as permanent audiovisual mod = Kann nicht als permanente audiovisuelle Mod verwendet werden Mod preselects map [comment] = Kartenvorauswahl der Mod [comment] + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties index 91d0842781..936c11039e 100644 --- a/android/assets/jsons/translations/Greek.properties +++ b/android/assets/jsons/translations/Greek.properties @@ -2386,6 +2386,8 @@ Status = # Requires translation! Current turn = # Requires translation! +You = + # Requires translation! Turn [turnNumber] = Location = Τοποθεσία # Requires translation! @@ -4286,6 +4288,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index c31799cd04..a1a483b2e0 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -1480,6 +1480,8 @@ Somewhere around [city] = Valahol [city] közelében Far away = Távoli Status = Állapot Current turn = Jelenlegi kör + # Requires translation! +You = Turn [turnNumber] = [turnNumber]. kör Location = Helyszín Unimproved = Területfejlesztés nélküli @@ -2534,6 +2536,8 @@ Should only be used as permanent audiovisual mod = Csak mint állandó audiovizu Can be used as permanent audiovisual mod = Állandó audiovizuális modként használható Cannot be used as permanent audiovisual mod = Nem használható állandó audiovizuális modként Mod preselects map [comment] = Mod által kiválasztott térkép [comment] + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 9d796d030a..28ebb1b43a 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -189,7 +189,6 @@ They promised not to settle near us ([count] turns remaining) = Mereka sudah ber [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! - # Requires translation! [civName] is upset that you attacked [cityState], whom they are allied with! = [civName] kecewa karena kamu menyerang [cityState], yang mereka sama-sama bersekutu! [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! @@ -219,7 +218,6 @@ I've been informed that my armies have taken tribute from [civName], a city-stat 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 mengirimkan upeti baru-baru ini dan mereka mengirimkannya.\nEngkau telah berjanji untuk melindungi mereka dari hal-hal seperti itu, tetapi kita berdua tahu bahwa kamu tidak mampu mendukungnya. It's come to my attention that I may have attacked [civName].\nWhile it was not my goal to be at odds with your empire, this was deemed a necessary course of action. = Aku telah mengetahui bahwa aku mungkin sudah menyerang [civName], negara-kota yang berada di bawah perlindunganmu.\nMeskipun tujuanku bukanlah untuk berselisih kekaisaranmu, tindakan ini adalah tindakan yang kuanggap perlu untuk dilakukan. 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. = Aku pikir kamu mungkin ingin mengetahui bahwa aku telah menyerbu salah satu negara peliharaan kecilmu.\nDaratan [civName] akan menjadi suatu tambahan yang baik bagiku. - # Requires translation! THIS MEANS WAR! = INI BERARTI PERANG! Return [unitName] to [civName]? = Kembalikan [unitName] kepada [civName]? @@ -259,7 +257,6 @@ City-States grow wary of your aggression. The resting point for Influence has de [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]! [cityState] no longer needs your assistance against [civName]. = [cityState] tidak lagi memerlukan bantuanmu melawan [civName]. - # Requires translation! [cityState] cancelled the quests they had given you because you demanded tribute from them. = [cityState] membatalkan misi yang mereka telah berikan kepadamu karena kamu menuntut upeti dari mereka. War against [civName] = Berperang melawan [civName] We need you to help us defend against [civName]. Killing [amount] of their military units would slow their offensive. = Kami memerlukanmu untuk membantu kami bertahan melawan [civName]. Membunuh [amount] unit militer mereka akan memperlambat serangan mereka. @@ -1035,7 +1032,6 @@ You and [name] are no longer allies! = Kamu dan [name] sudah tidak bersekutu lag [civName] has denounced us! = [civName] sudah mencela kita! [cityName] has been connected to your capital! = [cityName] sudah terhubung ke ibu kota! [cityName] has been disconnected from your capital! = [cityName] terputus dari ibu kota! - # Requires translation! Connect road completed = Menghubungkan jalan selesai [civName] has accepted your trade request = [civName] telah menerima permintaan dagangmu [civName] has made a counteroffer to your trade request = [civName] telah menawarkan tawaran balasan untuk permintaan dagangmu @@ -1472,6 +1468,8 @@ Somewhere around [city] = Di suatu tempat di sekitar [city] Far away = Jauh Status = Status Current turn = Giliran saat ini + # Requires translation! +You = Turn [turnNumber] = Giliran [turnNumber] Location = Lokasi Unimproved = Belum ditingkatkan @@ -2500,6 +2498,8 @@ Should only be used as permanent audiovisual mod = Hanya boleh digunakan sebagai Can be used as permanent audiovisual mod = Bisa digunakan sebagai mod audiovisual permanen Cannot be used as permanent audiovisual mod = Tidak bisa digunakan sebagai mod audiovisual permanen Mod preselects map [comment] = Mod memilih peta sebelumnya [comment] + # Requires translation! +if [modFilter] is enabled = ######### countable ########### @@ -2731,7 +2731,6 @@ Your use of nuclear weapons is disgusting! = Caramu menggunakan senjata nuklir i 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! You attacked City-States that were under our protection! = Kamu telah menyerang Negara-Kota yang berada di bawah perlindungan kami! - # Requires translation! You attacked our allied City-States! = Kamu menyerang Negara-Kota sekutu kami! You demanded tribute from City-States that were under our protection! = Kamu telah menagih upeti dari Negara-Kota yang berada di bawah perlindungan kami! You sided with a City-State over us = Kamu lebih berpihak kepada Negara-Kota daripada kami diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index fdbdfb27e7..448a258211 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -1474,6 +1474,8 @@ Somewhere around [city] = Intorno a [city] Far away = Lontano Status = Stato Current turn = Turno attuale + # Requires translation! +You = Turn [turnNumber] = Turno [turnNumber] Location = Posizione Unimproved = Non migliorata @@ -2502,6 +2504,8 @@ Should only be used as permanent audiovisual mod = Va usata solo come mod audiov Can be used as permanent audiovisual mod = Usabile come mod audiovisuale permanente Cannot be used as permanent audiovisual mod = Non usabile come mod audiovisuale permanente Mod preselects map [comment] = La mod preseleziona la mappa [comment] + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 42335ff9b0..9be1d39e21 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -92,13 +92,9 @@ Hydro Plant = 水力発電所 # City naming when list exhausted New [cityName] = ニュー[cityName] - # Requires translation! Neo [cityName] = ネオ[cityName] - # Requires translation! Nova [cityName] = ノヴァ[cityName] - # Requires translation! Altera [cityName] = アルテラ[cityName] - # Requires translation! New [civName]\n(formerly known as [cityName]) = ニュー[civName]\n（旧[cityName]） # Diplomacy,Trade,Nations @@ -110,9 +106,7 @@ Requires worked [resource] near city = 都市の近郊で稼働する[resource] Requires at least one of the following resources worked near the city: = 都市の近くに次の資源のどれか一つが必要: Wonder is being built elsewhere = 他の都市で建設中 National Wonder is being built elsewhere = 国家遺産は別の地で生成されている - # Requires translation! Requires a [buildingName] in all [cityFilter] cities = すべての[cityFilter]都市に[buildingName]が必要 - # Requires translation! Requires a [buildingName] in at least [amount] of [cityFilter] cities = [amount]以上の[cityFilter]都市に[buildingName]が必要 [buildingName] required: = [buildingName]が必要: Requires a [buildingName] in this city = この都市に[buildingName]が必要 @@ -892,7 +886,6 @@ Automated workers replace improvements = 自動化労働者がタイル整備を Automated units move on turn start = 自動化ユニットがターン開始時に動く Automated units can upgrade = 自動化ユニットがアップグレードできる Automated units choose promotions = 自動化ユニットが昇進を選択する - # Requires translation! Cities auto-bombard at end of turn = ターン終了時都市が自動で砲撃する Order trade offers by amount = 取引オファーを金額で注文 Ask for confirmation when pressing next turn = 次のターンへ進む前に確認を求める @@ -931,7 +924,6 @@ Screen orientation = 画面の向き Landscape (fixed) = 横画面（固定） Portrait (fixed) = 縦画面（固定） Auto (sensor adjusted) = 自動 - # Requires translation! Enable using display cutout areas = ディスプレイの切欠き部分を使う # Requires translation! Hide system status and navigation bars = @@ -941,7 +933,6 @@ Default Font = デフォルトのフォント Max zoom out = 最大ズームアウト Enable Easter Eggs = イースターエッグを有効化 - # Requires translation! Enable Scenarios (experimental) = シナリオを有効化（試験的） Enlarge selected notifications = 選択した通知を拡大表示する @@ -978,17 +969,12 @@ HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = 非常に実験的な機能です You need to restart the game for this change to take effect. = この変更を反映するにはゲームを再起動する必要があります。 # AutomationTab - # Requires translation! Automation = 自動化 # AutoPlay - # Requires translation! AutoPlay = オートプレイ - # Requires translation! Show AutoPlay button = オートプレイボタンを表示 - # Requires translation! Multi-turn AutoPlay amount = オートプレイのターン数 - # Requires translation! AutoPlay until victory = 勝利までオートプレイ # Requires translation! @@ -1078,7 +1064,6 @@ Your city [cityName] can bombard the enemy! = [cityName]が敵を砲撃できま [amount] of your cities can bombard the enemy! = [amount]の都市が敵を砲撃できます [amount] enemy units were spotted near our territory = 我々の領土の近くで敵のユニットを[amount]体確認しました [amount] enemy units were spotted in our territory = 我々の領土内で敵のユニットを[amount]体確認しました - # Requires translation! A(n) [nukeType] from [civName] has exploded in our territory! = [civName]の[nukeType]が我々の領土で爆発しました A(n) [nukeType] has been detonated by [civName]! = [nukeType]が[civName]によって起爆されました A(n) [nukeType] has been detonated by an unknown civilization! = [nukeType]が未知の文明によって起爆されました！ @@ -1447,7 +1432,9 @@ Wonders enabled = 遺産の建造が可能 Tile improvements enabled = タイル整備が有効 Reveals [resource] on the map = 地図に[resource]が表示される XP for new units = 新しく生産するユニットにXP + # Requires translation! provide = + # Requires translation! provides = City strength = 都市戦闘力 City health = 都市の耐久 @@ -1565,6 +1552,8 @@ Somewhere around [city] = [city]のあたり Far away = 遠く Status = 状況 Current turn = 現在のターン + # Requires translation! +You = Turn [turnNumber] = ターン[turnNumber] Location = 位置 Unimproved = 未整備 @@ -1742,7 +1731,6 @@ Resource [resource] does not exist in ruleset! = 資源の[resource]がルール Improvement [improvement] does not exist in ruleset! = タイル整備の[improvement]がルールセットに存在しません！ Nation [nation] does not exist in ruleset! = 国家の[nation]がルールセットに存在しません！ Natural Wonder [naturalWonder] does not exist in ruleset! = 自然遺産の[naturalWonder]がルールセットに存在しません！ - # Requires translation! non-[filter] = 非[filter] # Civilopedia difficulty levels @@ -2296,6 +2284,7 @@ Can be purchased with [stat] [cityFilter] = [cityFilter][stat]で購入できる Can be purchased for [amount] [stat] [cityFilter] = [cityFilter][amount][stat]で購入できる Limited to [amount] per Civilization = 文明あたり[amount]個まで生産できる Hidden until [amount] social policy branches have been completed = [amount]つの社会制度をコンプリートするまで隠されている + # Requires translation! Only available = # Requires translation! Unavailable = @@ -2496,6 +2485,7 @@ Can also be built on tiles adjacent to fresh water = 淡水源に隣接したタ Ensures a minimum tile yield of [stats] = Can be built outside your borders = 国境外に建設できる Can be built just outside your borders = 国境のすぐ外に建設できる + # Requires translation! Can only be built to improve a resource = Removes removable features when built = 整備時に削除できるタイル要素を削除する Gives a defensive bonus of [relativeAmount]% = [relativeAmount]％の防御ボーナスを付与 @@ -2562,11 +2552,8 @@ after enhancing a religion = 宗教強化後 # Requires translation! after generating a Great Prophet = if [buildingFilter] is constructed = [buildingFilter]が建設されていれば - # Requires translation! if [buildingFilter] is not constructed = [buildingFilter]が建設されていなければ - # Requires translation! if [buildingFilter] is constructed in all [cityFilter] cities = すべての[cityFilter]都市に[buildingFilter]が建設されていれば - # Requires translation! if [buildingFilter] is constructed in at least [positiveAmount] of [cityFilter] cities = [positiveAmount]以上の[cityFilter]都市に[buildingFilter]が建設されていれば # Requires translation! if [buildingFilter] is constructed by anybody = @@ -2783,6 +2770,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### @@ -2849,17 +2838,13 @@ Major = ######### City filters ########### in all cities = すべての都市で - # Requires translation! in your cities = あなたの都市で - # Requires translation! Your = あなたの in all coastal cities = すべての沿岸都市で Coastal = 海岸 in capital = 首都で - # Requires translation! Capital = 首都の in all non-occupied cities = すべての占領していない都市で - # Requires translation! Non-occupied = 占領されていない in all cities with a world wonder = 世界遺産があるすべての都市で in all cities connected to capital = 首都に接続するすべての都市で @@ -2876,10 +2861,8 @@ in enemy cities = in foreign cities = 異国の都市で Foreign = 異国 in annexed cities = 併合された都市で - # Requires translation! Annexed = 併合 in puppeted cities = 傀儡都市で - # Requires translation! Puppeted = 傀儡 # Requires translation! in resisting cities = @@ -3206,7 +3189,6 @@ Pan Down Alternate = Pan Right Alternate = # Requires translation! Connect road = - # Requires translation! Transform = 転換 Repair = 修復 Start Golden Age = 黄金時代を始める diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 8a73a0865f..fde5f541f9 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -1507,6 +1507,8 @@ Somewhere around [city] = [city] 근처 어딘가 Far away = 먼 곳 Status = 상태 Current turn = 현재 턴 + # Requires translation! +You = Turn [turnNumber] = [turnNumber] 턴 Location = 위치 Unimproved = 미개발 @@ -2584,6 +2586,8 @@ Can be used as permanent audiovisual mod = 시청각모드로 사용 가능 Cannot be used as permanent audiovisual mod = 시청각모드로 사용 불가 # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Latin.properties b/android/assets/jsons/translations/Latin.properties index 021388b5a6..0b7c93095e 100644 --- a/android/assets/jsons/translations/Latin.properties +++ b/android/assets/jsons/translations/Latin.properties @@ -2434,6 +2434,8 @@ Status = # Requires translation! Current turn = # Requires translation! +You = + # Requires translation! Turn [turnNumber] = # Requires translation! Location = @@ -4305,6 +4307,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index 602228ec6f..7f1c1990f3 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -1704,6 +1704,8 @@ Somewhere around [city] = kažkur netoli [city] Far away = labai toli Status = Būklė Current turn = Esamas ėjimas + # Requires translation! +You = Turn [turnNumber] = Ėjimas [turnNumber] Location = Vietovė Unimproved = Be patobulinimų @@ -2982,6 +2984,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index fa78402058..6934e88cd3 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -1848,6 +1848,8 @@ Status = # Requires translation! Current turn = # Requires translation! +You = + # Requires translation! Turn [turnNumber] = # Requires translation! Location = @@ -3619,6 +3621,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Norwegian.properties b/android/assets/jsons/translations/Norwegian.properties index 99668b69b0..0cee65b656 100644 --- a/android/assets/jsons/translations/Norwegian.properties +++ b/android/assets/jsons/translations/Norwegian.properties @@ -1752,6 +1752,8 @@ Somewhere around [city] = Ein stad kring [city] Far away = Langt unna Status = Status Current turn = Noverande tur + # Requires translation! +You = Turn [turnNumber] = Tur [turnNumber] Location = Stad Unimproved = Ubetra @@ -3150,6 +3152,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index 87ca8d693d..d98fa0b884 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -2217,6 +2217,8 @@ Status = # Requires translation! Current turn = # Requires translation! +You = + # Requires translation! Turn [turnNumber] = # Requires translation! Location = @@ -4069,6 +4071,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index 103c3494c4..5254560d54 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -1867,6 +1867,8 @@ Somewhere around [city] = Jaayi nazdik be [city] Far away = Door Status = Vaz’iyat Current turn = Nobat e konooni + # Requires translation! +You = Turn [turnNumber] = Nobat e [turnNumber] Location = Makaan Unimproved = Pishraft daade nashode @@ -3639,6 +3641,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index b802baf8de..b6c0af4be0 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -1490,6 +1490,8 @@ Somewhere around [city] = W pobliżu miasta [city] Far away = Daleko Status = Stan Current turn = Aktualna tura + # Requires translation! +You = Turn [turnNumber] = [turnNumber] tura Location = Położenie Unimproved = Nieulepszone @@ -2538,6 +2540,8 @@ Can be used as permanent audiovisual mod = Może być używany jako mod permanen Cannot be used as permanent audiovisual mod = Nie może zostać użyty jako mod permanentnie widoczny # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 11034ea7ec..b3a425f22f 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -1489,6 +1489,8 @@ Somewhere around [city] = Em algum lugar ao redor de [city] Far away = Longe Status = Estado Current turn = Turno atual + # Requires translation! +You = Turn [turnNumber] = Turno [turnNumber] Location = Localização Unimproved = Não melhorado @@ -2553,6 +2555,8 @@ Can be used as permanent audiovisual mod = Pode ser utilizado como mod audiovisu Cannot be used as permanent audiovisual mod = Não pode ser utilizado como mod audiovisual permanente # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index e330b9dff7..faed3c0ffa 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -1581,6 +1581,8 @@ Somewhere around [city] = Undeva lângă [city] Far away = Departe Status = Stare Current turn = Rândul curent + # Requires translation! +You = Turn [turnNumber] = Rândul [turnNumber] Location = Locație Unimproved = Neîmbunătățit @@ -2940,6 +2942,8 @@ Can be used as permanent audiovisual mod = Poate fi folosit ca mod audiovizual p Cannot be used as permanent audiovisual mod = Nu poate fi folosit ca mod audiovizual permanent # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index b6a8c77cbe..951091043d 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -1495,6 +1495,8 @@ Somewhere around [city] = Где-то неподалёку от [city] Far away = Очень далеко Status = Статус Current turn = Текущий ход + # Requires translation! +You = Turn [turnNumber] = Ход [turnNumber] Location = Расположение Unimproved = Без улучшения @@ -2545,6 +2547,8 @@ Can be used as permanent audiovisual mod = Может быть использо Cannot be used as permanent audiovisual mod = Не может быть использован как постоянный аудиовизуальный мод # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Rusyn.properties b/android/assets/jsons/translations/Rusyn.properties index 1a0de84ba6..b30dfe57a0 100644 --- a/android/assets/jsons/translations/Rusyn.properties +++ b/android/assets/jsons/translations/Rusyn.properties @@ -2355,6 +2355,8 @@ Status = # Requires translation! Current turn = # Requires translation! +You = + # Requires translation! Turn [turnNumber] = # Requires translation! Location = @@ -3975,6 +3977,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index f36dec5ff7..42d0c4087c 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -1470,6 +1470,8 @@ Somewhere around [city] = 在[city]周围 Far away = 远离 Status = 状态 Current turn = 当前回合 + # Requires translation! +You = Turn [turnNumber] = 回合[turnNumber] Location = 位置 Unimproved = 未开发 @@ -2498,6 +2500,8 @@ Should only be used as permanent audiovisual mod = 只能用作永久视听Mod Can be used as permanent audiovisual mod = 可作为永久视听Mod Cannot be used as permanent audiovisual mod = 不能用作永久视听Mod Mod preselects map [comment] = 模组预选地图：[comment] + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 7ac0fb3d8a..f5555955b1 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -1472,6 +1472,8 @@ Somewhere around [city] = En algún lugar cerca de [city] Far away = Lejos Status = Estado Current turn = Turno actual + # Requires translation! +You = Turn [turnNumber] = Turno [turnNumber] Location = Ubicación Unimproved = Sin mejorar @@ -2503,6 +2505,8 @@ Should only be used as permanent audiovisual mod = Sólo debería ser usado como Can be used as permanent audiovisual mod = Puede usarse como mod audiovisual Cannot be used as permanent audiovisual mod = No puede usarse como mod audiovisual Mod preselects map [comment] = El mod preselecciona el mapa: [comment] + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index 3ca73f4459..389e4ce690 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -1695,6 +1695,8 @@ Somewhere around [city] = Någonstans kring [city] Far away = Långt borta Status = Status Current turn = Nuvarande drag + # Requires translation! +You = Turn [turnNumber] = Drag [turnNumber] Location = Plats Unimproved = Oförbättrad @@ -2996,6 +2998,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index a4e4b52d6a..62864a917e 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -1534,6 +1534,8 @@ Somewhere around [city] = [city]附近的某個地方 Far away = 遠處 Status = 地位 Current turn = 當前回合 + # Requires translation! +You = Turn [turnNumber] = [turnNumber]回合 Location = 地點 Unimproved = 未開發 @@ -2623,6 +2625,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 32f20808be..e2768d8191 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -1498,6 +1498,8 @@ Somewhere around [city] = [city] şehrinin etrafında bir yerde Far away = Çok uzak Status = Durum Current turn = Şu anki tur + # Requires translation! +You = Turn [turnNumber] = Tur [turnNumber] Location = Konum Unimproved = Geliştirilmemiş @@ -2559,6 +2561,8 @@ Can be used as permanent audiovisual mod = Daimi görsel-işitsel mod olarak kul Cannot be used as permanent audiovisual mod = Daimi görsel-işitsel mod olarak kullanılamaz # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index b31f5e5378..50c10c3afc 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -257,7 +257,6 @@ City-States grow wary of your aggression. The resting point for Influence has de [cityState] is being attacked by [civName]! Kill [amount] of the attacker's military units and they will be immensely grateful. = Місто-держава [cityState] атаковане нацією [civName]! Знищіть [amount] бойових підрозділів нападника та отримаєте безмежну вдячність. [cityState] is deeply grateful for your assistance in the war against [civName]! = Місто-держава [cityState] неймовірно вдячне за допомогу у війні проти нації [civName]! [cityState] no longer needs your assistance against [civName]. = Місто-держава [cityState] більше не потребує допомоги у війні проти нації [civName]. - # Requires translation! [cityState] cancelled the quests they had given you because you demanded tribute from them. = Місто-держава [cityState] скасувало видані вам завдання, оскільки ви намагалися стягнути з нього данину. War against [civName] = Війна проти нації [civName] We need you to help us defend against [civName]. Killing [amount] of their military units would slow their offensive. = Ми потребуємо вашої допомоги, щоб захиститися від нації [civName]. Знищення [amount] їхніх військових підрозділів уповільнило б їхній наступ. @@ -1033,7 +1032,6 @@ You and [name] are no longer allies! = Розірвано ваш союз з м [civName] has denounced us! = Нація [civName] засудила нас! [cityName] has been connected to your capital! = Місто [cityName] було приєднано до вашої столиці! [cityName] has been disconnected from your capital! = Місто [cityName] було від’єднано від вашої столиці! - # Requires translation! Connect road completed = Дорожнє з'єднання завершено [civName] has accepted your trade request = Нація [civName] приймає вашу торгову пропозицію [civName] has made a counteroffer to your trade request = Нація [civName] робить зустрічну пропозицію @@ -1470,6 +1468,8 @@ Somewhere around [city] = Десь біля міста [city] Far away = Далеко-далеко Status = Статус Current turn = Поточний хід + # Requires translation! +You = Turn [turnNumber] = Хід [turnNumber] Location = Розташування Unimproved = Без покращень @@ -2498,6 +2498,8 @@ Should only be used as permanent audiovisual mod = Має бути викори Can be used as permanent audiovisual mod = Може бути використано як постійний аудіо-візуальний мод Cannot be used as permanent audiovisual mod = Не може бути використано як постійний аудіо-візуальний мод Mod preselects map [comment] = Мод надає перевагу мапі [comment] + # Requires translation! +if [modFilter] is enabled = ######### countable ########### @@ -6750,7 +6752,6 @@ Once a Technology has it's cost fully paid, you unlock the benefits for your Nat Researching a Technology in the next Era will advance you into that Era and trigger a notification to other Nations about how amazing you are! = Дослідження технології з наступної епохи просуне вас у ту епоху, і створить сповіщення для всіх інших націй щодо того, наскільки ви вже просунуті! Since new Technologies tend to give access to better Units, Buildings, and even unlock powerful new Policies, staying ahead of the competition is one of the best ways to secure your Victory! = Оскільки нові технології зазвичай дають доступ до кращих підрозділів, споруд, і навіть потужних нових політик, бути попереду в цьому змаганні є одним з найкращих способів забезпечити собі перемогу! - # Requires translation! Ah Gold. The Universal Medium of Exchange. Everyone loves Gold! They say it can't buy Happiness, but nuclear submarines are almost as good. = Золото. Універсальний засіб обміну. Всі обожнюють золото! Кажуть, воно не здатне купити щастя, але атомні підводні човни майже настільки ж класні. # Requires translation! You can earn more Gold from Tiles, Resources, Improvements, and eventually Buildings, Specialists, and Trade Routes. Ancient Ruins, meeting new City-States, and Pillaging are also great sources of Gold. During a Golden Age every Tile that already yields Gold will yield an additional Gold! = @@ -6760,9 +6761,7 @@ Gold is how you pay for Building Maintenance, Transportation Upkeep, and Unit Up Gold can be used to Buy Buildings and Units, helping bring up a new City or quickly build an Army. It can also buy Tiles to add to your City. It's also used to Upgrade your units from their older, obsolete forms to new, stronger versions. And investing it into a Research Agreement is a great way to convert it into ⍾Science. = # Requires translation! Gold is also very valuable in Diplomacy. You can directly Gift Gold to City-States to gain their favor. Use it to balance a Trade Deal with other Nations. Or demand every last drop after a successful war and your enemy sues for peace. = - # Requires translation! Ironically, some may consider Gold to be one of the less important Resources. But it's flexible nature and importance to keep your Nation running makes it a precious thing to pay attention to. After all, everyone loves Gold. = Іронічно, але дехто може вважати золото одним із менш значущих ресурсів. Але його гнучка природа і необхідність підтримки вашої нації робить золото річчю вартою уваги. Врешті, всі люблять золото. - # Requires translation! Not to be confused with the Resource of the same name, Gold Ore = Не плутати із ресурсом із такою ж назвою - золотою рудою. See also: Trade Route = Дивіться також: Торговельні шляхи See also: Golden Age = Дивіться також: Золота доба @@ -6856,7 +6855,6 @@ Units use the 'Strength' value as the base combat value when melee attacking and Ranged attacks can be done from a distance, dependent on the 'Range' value of the unit.\nWhile melee attacks allow the defender to damage the attacker in retaliation, ranged attacks do not. = Атаки дальнього бою можна здійснювати на відстані, залежно від значення "…Дальність" підрозділу.\nЯкщо атакувати ворога атакою ближнього бою, то він може дати відсіч, проте у випадку з атакою дальнього бою такого не буде. Research Agreements = Спільні дослідження - # Requires translation! In research agreements, you and another civilization decide to jointly research technology.\nAt the end of the agreement, you will both receive a 'lump sum' of ⍾Science, which will go towards one of your unresearched technologies. = За спільного дослідження, ви та інша нація вирішуєте об'єднано докласти зусиль до дослідження технологій.\nВ кінці угоди ви отримаєте одразу купу одиниць ⍾Науки, що дозволить вам просунутись у ваших поточних дослідженнях. The amount of ⍾Science you receive at the end is dependent on the ⍾Science generated by your cities and the other civilization's cities during the agreement - the more, the better! = Кількість ⍾Науки, яку ви отримаєте в кінці кінців, залежить від ⍾Науки, створеної вашими містами та містами іншої цивілізації під час угоди — чим більше, тим краще! # Requires translation! @@ -6880,7 +6878,6 @@ Great Improvements also provide any strategic resources that are under them, so Removing Terrain Features = Видалення особливостей місцевості Certain tiles have terrain features - like Flood plains or Forests - on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to add improvements exploiting those resources. = Деякі клітинки містять особливості місцевості - наприклад, заплави або ліси. Джунглі, болота та ліси можуть бути прибрані робітниками.\nВидалення особливостей не знищує ресурси на цих клітинках, і зазвичай потрібне для створення покращень для добування цих ресурсів. - # Requires translation! Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, ⍾Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = Природні дива, такі як гора Фуджі, Габралтарська скеля, та Великий Бар'єрний Риф, є унікальними, непроходними елементами ландшафту, шедеврами від матінки природи, які мають вийняткові якості, що дуже різнять їх від звичайної місцини.\nВони надають вам великі кількості Культури, ⍾Науки, Золота, або Виробництва, якщо оброблюються одним із ваших міст, і саме тому ви можете зажадати включити їх до складу вашої імперії якнайшвидше. Keyboard = Клавіатура @@ -7093,3 +7090,4 @@ Miscellaneous = Різне External links = Зовнішні посилання External links support right-click or long press to copy the link to the clipboard instead of launching the browser. = Зовнішні посилання підтримують правий клік або довге натиснення для копіювання посилання в буфер обміну замість відкриття браузера. Example: The 'Open Github page' button on the Mod management screen. = Приклад: кнопка 'Відкрити сторінку Github' на екрані керування Модами. + diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties index 92b5d24e2d..f5e0623753 100644 --- a/android/assets/jsons/translations/Vietnamese.properties +++ b/android/assets/jsons/translations/Vietnamese.properties @@ -1499,6 +1499,8 @@ Somewhere around [city] = Đâu đó xung quanh [city] Far away = Xa Status = Trạng thái Current turn = Lượt hiện tại + # Requires translation! +You = Turn [turnNumber] = [turnNumber] luợt Location = Vị trí Unimproved = Không được cải thiện @@ -2568,6 +2570,8 @@ Can be used as permanent audiovisual mod = Có thể được sử dụng như m Cannot be used as permanent audiovisual mod = Không thể được sử dụng như mod âm thanh và hình ảnh cố định # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/Zulu.properties b/android/assets/jsons/translations/Zulu.properties index 176981eb2b..a54e294ec2 100644 --- a/android/assets/jsons/translations/Zulu.properties +++ b/android/assets/jsons/translations/Zulu.properties @@ -2169,6 +2169,8 @@ Status = # Requires translation! Current turn = # Requires translation! +You = + # Requires translation! Turn [turnNumber] = # Requires translation! Location = @@ -4125,6 +4127,8 @@ Can be used as permanent audiovisual mod = Cannot be used as permanent audiovisual mod = # Requires translation! Mod preselects map [comment] = + # Requires translation! +if [modFilter] is enabled = ######### countable ########### diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 741b2df12b..a2c406d28f 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -24,7 +24,7 @@ Lithuanian = 84 Malay = 24 Norwegian = 61 Persian_(Pinglish-DIN) = 12 -Persian_(Pinglish-UN) = 28 +Persian_(Pinglish-UN) = 27 Polish = 97 Portuguese = 67 Romanian = 75 diff --git a/changelog.md b/changelog.md index 03c26ffdd2..eb289ded9a 100644 --- a/changelog.md +++ b/changelog.md @@ -1,51 +1,17 @@ ## 4.12.18 -Added support for new historyranking serialization - saved ~10% of save file size +Reduced (uncompressed) save file size by 15%, with 15% pending later versions -Use custom Vector2 serialization - reduces total file size by 4% - -lint - -Fix tests please work - -fix tests - -Fix tests - -Fix tests - -Fix tests - -Add descriptor (you, friend name, or unknown) to current turn for mp games - -Auto-download missing mods when joining multiplayer game - -Allow Spectator to force-resign any human in multiplayer, and allow anyone to do so if player is inactive for 48h - -Send speed for all trade offers, instead of using static - allows for 'next turn' without setting UncivGame.current - -Multiplayer: Disable resign button on games where it's not your turn - -doc: Free buildings cannot be self-removing +Multiplayer improvements: +- Add descriptor (you/friend name/unknown) to current player +- Auto-download missing mods when joining multiplayer game +- Can force-resign any human, if 'admin' spectator or player is inactive for 48h +- Disable resign button on games where it's not your turn Fixed city console rename to set exact text (not quoted/lowercased) -chore: Renamed OnlineMultiplayer -> Multiplayer. That's the default MP, local MP is called 'hotseat'. - -Extracted File functions from OnlineMultiplayer to separate class, for separation of concerns between *local files* and *online data* - -minor perf: Map getTile does one lookup instead of two - -Removed empty objects from json serialization with equality instead of post-hoc string replace - kudos @SomeTroglodyte - Conditional that tests if a mod is enabled - by @SomeTroglodyte -Remove another 15% of unnecessary save file size - -Remove default values that were serialized per tile - reduced 12.5% of file size! - -Minor changes - ## 4.12.17 Modding: diff --git a/core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerScreen.kt b/core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerScreen.kt index 681f0477ae..a361101e7e 100644 --- a/core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerScreen.kt +++ b/core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerScreen.kt @@ -46,7 +46,6 @@ class MultiplayerScreen : PickerScreen() { private val friendsListButton = createFriendsListButton() private val refreshButton = createRefreshButton() - private val rightSideTable = createRightSideTable() val gameList = GameList(::selectGame) init { @@ -90,28 +89,23 @@ class MultiplayerScreen : PickerScreen() { } } - private fun createRightSideTable(): Table { - val table = Table() - table.defaults().uniformX() - table.defaults().fillX() - table.defaults().pad(10f) + private fun getGeneralActionsTable(): Table { + val generalActions = Table().apply { defaults().pad(10f) } + generalActions.add(copyUserIdButton).row() + generalActions.add(addGameButton).row() + generalActions.add(friendsListButton).row() + generalActions.add(refreshButton).row() + return generalActions + } + private fun getGameSpecificActionsTable(): Table { val gameSpecificActions = Table().apply { defaults().pad(10f) } gameSpecificActions.add(copyGameIdButton).row() gameSpecificActions.add(renameButton).row() gameSpecificActions.add(resignButton).row() gameSpecificActions.add(forceResignButton).row() gameSpecificActions.add(deleteButton).row() - table.add(gameSpecificActions) - - val generalActions = Table().apply { defaults().pad(10f) } - generalActions.add(copyUserIdButton).row() - generalActions.add(addGameButton).row() - generalActions.add(friendsListButton).row() - generalActions.add(refreshButton).row() - table.add(generalActions) - - return table + return gameSpecificActions } private fun createRefreshButton(): TextButton { @@ -283,7 +277,8 @@ class MultiplayerScreen : PickerScreen() { private fun createMainContent(): Table { val mainTable = Table() mainTable.add(ScrollPane(gameList).apply { setScrollingDisabled(true, false) }).center() - mainTable.add(rightSideTable) + mainTable.add(getGameSpecificActionsTable()) + mainTable.add(getGeneralActionsTable()) return mainTable } diff --git a/fastlane/metadata/android/en-US/changelogs/1035.txt b/fastlane/metadata/android/en-US/changelogs/1035.txt index d950a602cd..ff32dd4f0c 100644 --- a/fastlane/metadata/android/en-US/changelogs/1035.txt +++ b/fastlane/metadata/android/en-US/changelogs/1035.txt @@ -1,47 +1,11 @@ +Reduced (uncompressed) save file size by 15%, with 15% pending later versions - -Added support for new historyranking serialization - saved ~10% of save file size - -Use custom Vector2 serialization - reduces total file size by 4% - -lint - -Fix tests please work - -fix tests - -Fix tests - -Fix tests - -Fix tests - -Add descriptor (you, friend name, or unknown) to current turn for mp games - -Auto-download missing mods when joining multiplayer game - -Allow Spectator to force-resign any human in multiplayer, and allow anyone to do so if player is inactive for 48h - -Send speed for all trade offers, instead of using static - allows for 'next turn' without setting UncivGame.current - -Multiplayer: Disable resign button on games where it's not your turn - -doc: Free buildings cannot be self-removing +Multiplayer improvements: +- Add descriptor (you/friend name/unknown) to current player +- Auto-download missing mods when joining multiplayer game +- Can force-resign any human, if 'admin' spectator or player is inactive for 48h +- Disable resign button on games where it's not your turn Fixed city console rename to set exact text (not quoted/lowercased) -chore: Renamed OnlineMultiplayer -> Multiplayer. That's the default MP, local MP is called 'hotseat'. - -Extracted File functions from OnlineMultiplayer to separate class, for separation of concerns between *local files* and *online data* - -minor perf: Map getTile does one lookup instead of two - -Removed empty objects from json serialization with equality instead of post-hoc string replace - kudos @SomeTroglodyte - -Conditional that tests if a mod is enabled - by @SomeTroglodyte - -Remove another 15% of unnecessary save file size - -Remove default values that were serialized per tile - reduced 12.5% of file size! - -Minor changes \ No newline at end of file +Conditional that tests if a mod is enabled - by @SomeTroglodyte \ No newline at end of file