diff --git a/android/assets/jsons/translations/Afrikaans.properties b/android/assets/jsons/translations/Afrikaans.properties index ace17f475a..a406b386a4 100644 --- a/android/assets/jsons/translations/Afrikaans.properties +++ b/android/assets/jsons/translations/Afrikaans.properties @@ -3998,6 +3998,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Belarusian.properties b/android/assets/jsons/translations/Belarusian.properties index ad3309ec16..a7c95e3593 100644 --- a/android/assets/jsons/translations/Belarusian.properties +++ b/android/assets/jsons/translations/Belarusian.properties @@ -3921,6 +3921,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Bosnian.properties b/android/assets/jsons/translations/Bosnian.properties index db5cb9a4c2..a1744f3016 100644 --- a/android/assets/jsons/translations/Bosnian.properties +++ b/android/assets/jsons/translations/Bosnian.properties @@ -4232,6 +4232,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 64e9c14b95..25b806f56c 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -2361,6 +2361,20 @@ upon ending a turn in a [tileFilter] tile = ao terminar um turno em um painel [t upon discovering a [tileFilter] tile = ao descobrir um painel [tileFilter] hidden from users = escondido dos usuários Comment [comment] = [comment] + # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = Mod is incompatible with [modFilter] = O mod é incompatível com [modFilter] Mod requires [modFilter] = O mod requer [modFilter] Should only be used as permanent audiovisual mod = Deve ser usado apenas como mod audiovisual permanente diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties index ab833567cb..b73663d9f7 100644 --- a/android/assets/jsons/translations/Bulgarian.properties +++ b/android/assets/jsons/translations/Bulgarian.properties @@ -3317,6 +3317,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties index 033bfe1316..a4a5533058 100644 --- a/android/assets/jsons/translations/Catalan.properties +++ b/android/assets/jsons/translations/Catalan.properties @@ -2366,6 +2366,20 @@ upon ending a turn in a [tileFilter] tile = quan acaba el torn en una casella de upon discovering a [tileFilter] tile = quan es descobreix una casella [tileFilter] hidden from users = amagat als usuaris Comment [comment] = [comment] + # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = Mod is incompatible with [modFilter] = El mod no és compatible amb [modFilter] Mod requires [modFilter] = El mod necessita [modFilter] Should only be used as permanent audiovisual mod = Només es pot fer servir com a mod audiovisual permanent diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 137ba69ea4..6532ea003b 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -2787,6 +2787,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 8305fded8d..d456bdae33 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -2374,6 +2374,20 @@ upon ending a turn in a [tileFilter] tile = na het beindigen van een beurt in ee upon discovering a [tileFilter] tile = na het ontdekken van een [tileFilter] tegel hidden from users = Verborgen voor gebruikers Comment [comment] = [comment] + # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = Mod is incompatible with [modFilter] = Mod is niet compatibel met [modFilter] Mod requires [modFilter] = Mod vereist [modFilter] Should only be used as permanent audiovisual mod = Wordt best enkel gebruikt als een permanente audiovisuele mod diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 363f7ae377..5cf703cb2b 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -4428,6 +4428,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties index abdcff3e20..2bdac1ef1a 100644 --- a/android/assets/jsons/translations/Filipino.properties +++ b/android/assets/jsons/translations/Filipino.properties @@ -2566,6 +2566,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index 3bae830345..406ce2b913 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -3444,6 +3444,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 350b576d1b..bcecbf44f8 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -2263,15 +2263,10 @@ when below [amount] [stat/resource] = quand à moins de [amount] [stat/resource] when above [amount] [stat/resource] (modified by game speed) = quand à plus de [amount] [stat/resource] (modifié par vitesse de jeu) when below [amount] [stat/resource] (modified by game speed) = quand à moins de [amount] [stat/resource] (modifié par vitesse de jeu) in this city = dans cette ville - # Requires translation! in [cityFilter] cities = dans les villes [cityFilter] - # Requires translation! in cities connected to the capital = dans les villes connectées à la capitale - # Requires translation! in cities with a major religion = dans les villes avec une religion majeure - # Requires translation! in cities with an enhanced religion = dans les villes avec une religion renforcée - # Requires translation! in cities following our religion = dans les villes pratiquant votre religion in cities with a [buildingFilter] = dans les villes avec [buildingFilter] in cities without a [buildingFilter] = dans les villes sans [buildingFilter] @@ -2366,6 +2361,20 @@ upon ending a turn in a [tileFilter] tile = en terminant un tour sur une case [t upon discovering a [tileFilter] tile = en découvrant une case [tileFilter] hidden from users = Caché aux joueurs Comment [comment] = [comment] + # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = Mod is incompatible with [modFilter] = Le mod est incompatible avec [modFilter] Mod requires [modFilter] = Le mod nécessite [modFilter] Should only be used as permanent audiovisual mod = Devrait être activé uniquement comme mod audiovisuel permanent @@ -2402,38 +2411,29 @@ Air = Aérienne(s) ######### City filters ########### in all cities = dans toutes les villes - # Requires translation! in your cities = dans vos villes - # Requires translation! Your = Votre(vos) in all coastal cities = dans toutes les villes côtières Coastal = Côtière(s) in capital = dans la capitale - # Requires translation! Capital = Capitale(s) in all non-occupied cities = dans toutes les villes non-occupées - # Requires translation! Non-occupied = Non-occupée(s) in all cities with a world wonder = dans toutes les villes avec une merveille mondiale in all cities connected to capital = dans toutes les villes connectées à la capitale in all cities with a garrison = dans toutes les villes avec une garnison - # Requires translation! Garrisoned = En garnison in all cities in which the majority religion is a major religion = dans toutes les villes où la religion majoritaire est une religion majeure in all cities in which the majority religion is an enhanced religion = dans toutes les villes où la religion majoritaire est une religion renforcée in non-enemy foreign cities = dans les villes étrangères non-ennemies - # Requires translation! in enemy cities = dans les villes ennemies in foreign cities = dans les villes étrangères Foreign = Étrangère(s) in annexed cities = dans les villes annexées - # Requires translation! Annexed = Annexée(s) in puppeted cities = dans les villes fantoches - # Requires translation! Puppeted = Fantoche(s) in holy cities = dans les villes saintes - # Requires translation! Holy = Sainte(s) in City-State cities = dans les villes Cité-État in cities following this religion = dans les villes pratiquant cette religion diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 2b6789ebd5..fff197e6a9 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -2366,6 +2366,20 @@ upon ending a turn in a [tileFilter] tile = bei Beendigung einer Runde auf einem upon discovering a [tileFilter] tile = bei Entdeckung eines [tileFilter] Feldes hidden from users = vor dem Benutzer versteckt Comment [comment] = [comment] + # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = Mod is incompatible with [modFilter] = Mod ist nicht kompatibel mit [modFilter] Mod requires [modFilter] = Mod erfordert [modFilter] Should only be used as permanent audiovisual mod = Sollte nur als permanente audiovisuelle Mod verwendet werden diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties index ebf370d06b..fdfe634868 100644 --- a/android/assets/jsons/translations/Greek.properties +++ b/android/assets/jsons/translations/Greek.properties @@ -4040,6 +4040,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index 9416943fed..778c3846f3 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -2372,6 +2372,20 @@ upon ending a turn in a [tileFilter] tile = a kör [tileFilter] mezőn való bef upon discovering a [tileFilter] tile = egy [tileFilter] mező felfedezésekor hidden from users = a felhasználók elől rejtve Comment [comment] = [comment] + # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = Mod is incompatible with [modFilter] = [modFilter] és a mod nem kompatibilisek Mod requires [modFilter] = [modFilter] szükséges a modhoz Should only be used as permanent audiovisual mod = Csak mint állandó audiovizuális mod használandó diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index b9e74aa4ee..0b8c7dad2a 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -2373,6 +2373,20 @@ upon ending a turn in a [tileFilter] tile = saat menyelesaikan giliran di daerah upon discovering a [tileFilter] tile = saat menemukan daerah [tileFilter] hidden from users = disembunyikan dari pengguna Comment [comment] = [comment] + # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = Mod is incompatible with [modFilter] = Mod tidak kompatibel dengan [modFilter] Mod requires [modFilter] = Mod memerlukan [modFilter] Should only be used as permanent audiovisual mod = Hanya boleh digunakan sebagai mod audiovisual permanen diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index a755f1ba57..6f3e3e7402 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -2361,6 +2361,20 @@ upon ending a turn in a [tileFilter] tile = quando finisci un turno su una casel upon discovering a [tileFilter] tile = quando scopri una casella [tileFilter] hidden from users = nascosto dagli utenti Comment [comment] = [comment] + # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = Mod is incompatible with [modFilter] = La mod è incompatibile con [modFilter] Mod requires [modFilter] = La mod richiede [modFilter] Should only be used as permanent audiovisual mod = Va usata solo come mod audiovisuale diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 228beae8b5..ecba14e89b 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -2527,6 +2527,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 7e9103b8a3..2b77c52ff9 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -2384,6 +2384,20 @@ upon ending a turn in a [tileFilter] tile = [tileFilter] 타일에서 턴을 마 upon discovering a [tileFilter] tile = [tileFilter] 타일 발견 시 hidden from users = 유저에게 보이지 않음 Comment [comment] = [comment] + # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = Mod is incompatible with [modFilter] = 모드가 [modFilter]에 호환되지 않음 Mod requires [modFilter] = 모드에 [modFilter]이(가) 필요함 Should only be used as permanent audiovisual mod = 시청각모드로만 사용 가능함 @@ -3157,9 +3171,7 @@ Generous Egypt makes you this offer. = 이집트의 관대함으로 이 거래 Good day. = 좋은 날이군. Oh, it's you. = 음, 네놈인가. Monument Builders = 불가사의 건축가 - # Requires translation! O great Ramesses, Pharaoh of Egypt, bright as the Sun and mighty as the Nile! Lord of all living things, you lead the greatest of all civilizations, which has gifted the world with writing, advanced mathematics, sculpture, and architecture. Egyptian monuments and culture will continue to amaze the world for thousands of years. = 오, 뜨거운 태양처럼 눈부시고 흐르는 나일 강처럼 힘찬 이집트의 파라오, 위대한 람세스여! 생명있는 모든 것들의 영장이여, 그대가 다스리는 가장 위대한 문명은 문자, 고급 수학, 조각, 건축을 세상에 선사하였습니다. 이집트의 유적과 문화는 수천 년간 세계의 경탄을 자아낼 것입니다. - # Requires translation! Mighty and eternal Ramesses, Egypt lasted for millenia, whereas other civilisations disappeared into dust after a few centuries. Amun-Ra blesses you again to lead Egypt and its people on the path of light. Will your new empire shine through the ages of history? = 강력하고 영원한 람세스여, 다른 문명들이 몇 세기 만에 멸하는 와중에도 이집트는 몇천 년을 견디었습니다. 아문 라께서 다시 한번 축복을 내리시어 그대로 하여금 이집트 국민을 빛의 길로 인도케 하십니다. 그대의 제국이 세월 속에서 빛나게 하시겠습니까? Thebes = 테베 Memphis = 멤피스 diff --git a/android/assets/jsons/translations/Latin.properties b/android/assets/jsons/translations/Latin.properties index 471fa8c790..80be4a1990 100644 --- a/android/assets/jsons/translations/Latin.properties +++ b/android/assets/jsons/translations/Latin.properties @@ -4176,6 +4176,20 @@ hidden from users = # Requires translation! Comment [comment] = # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index d32a91d694..180c02a8f5 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -2719,6 +2719,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index b2b3bed511..44bd8722b8 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -3367,6 +3367,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index 2868ecac3e..95accd9485 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -3820,6 +3820,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index 288278a07b..d24b401893 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -3391,6 +3391,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index bf5ecc389b..c3bfe360cd 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -2263,15 +2263,10 @@ when below [amount] [stat/resource] = gdy posiadasz mniej niż [amount] [stat/re when above [amount] [stat/resource] (modified by game speed) = gdy posiadasz więcej niż [amount] [stat/resource] (modyfikowane przez szybkość gry) when below [amount] [stat/resource] (modified by game speed) = gdy posiadasz mniej niż [amount] [stat/resource] (modyfikowane przez szybkość gry) in this city = w tym mieście - # Requires translation! in [cityFilter] cities = w miastach [cityFilter] - # Requires translation! in cities connected to the capital = w miastach połączonych ze stolicą - # Requires translation! in cities with a major religion = w miastach z religią dominującą - # Requires translation! in cities with an enhanced religion = w miastach ze wzmocnioną religią - # Requires translation! in cities following our religion = w miastach wyznających naszą religię in cities with a [buildingFilter] = w miastach z [buildingFilter] in cities without a [buildingFilter] = w miastach bez → [buildingFilter] @@ -2366,6 +2361,20 @@ upon ending a turn in a [tileFilter] tile = po zakończeniu tury na polu [tileFi upon discovering a [tileFilter] tile = po odkryciu pola [tileFilter] hidden from users = Ukryte przed graczami Comment [comment] = [comment] + # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = Mod is incompatible with [modFilter] = Mod jest niekompatybilny z [modFilter] Mod requires [modFilter] = Mod wymaga [modFilter] Should only be used as permanent audiovisual mod = Powinien być zawsze używany jako mod permanentnie widoczny @@ -2402,38 +2411,29 @@ Air = lotnicze ######### City filters ########### in all cities = we wszystkich miastach - # Requires translation! in your cities = w twoich miastach - # Requires translation! Your = Twój in all coastal cities = we wszystkich miastach nadmorskich Coastal = Wybrzeże in capital = w Stolicy - # Requires translation! Capital = Stolica in all non-occupied cities = we wszystkich nieokupowanych miastach - # Requires translation! Non-occupied = Nieokupowane in all cities with a world wonder = we wszystkich miastach z Cudami in all cities connected to capital = we wszystkich miastach połączonych ze stolicą in all cities with a garrison = we wszystkich miastach posiadających garnizon - # Requires translation! Garrisoned = Zgarnizowana in all cities in which the majority religion is a major religion = we wszystkich miastach, w których większość wyznaje dominującą religię in all cities in which the majority religion is an enhanced religion = we wszystkich miastach, w których większość wyznaje rozszerzaną religię in non-enemy foreign cities = w obcych miastach niebędących wrogami - # Requires translation! in enemy cities = we wrogich miastach in foreign cities = w obcych miastach Foreign = Obcy in annexed cities = w zaanektowanych miastach - # Requires translation! Annexed = Zaanektowane in puppeted cities = w miastach marionetkowych - # Requires translation! Puppeted = marionetkowe in holy cities = w Świętych Miastach - # Requires translation! Holy = Święte in City-State cities = w Wolnych Miastach in cities following this religion = w miastach wyznających tę religię @@ -2453,7 +2453,6 @@ resource = surowiec Foreign Land = Obcy Teren Friendly Land = Przyjazny Teren Enemy Land = wrogim terenie - # Requires translation! your = twój Featureless = Bez cech szczególnych Fresh Water = woda pitna diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 8651595e57..9fff0e680f 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -2863,6 +2863,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index e35d0bd477..8aee07a8b1 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -2710,6 +2710,20 @@ upon discovering a [tileFilter] tile = # Requires translation! hidden from users = Comment [comment] = [comment] + # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = Mod is incompatible with [modFilter] = Mod-ul este incompatibil cu [modFilter] # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 33c970c465..e7b86d9431 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -2391,6 +2391,20 @@ upon ending a turn in a [tileFilter] tile = при окончании хода upon discovering a [tileFilter] tile = при нахождении клетки [tileFilter] hidden from users = спрятано от пользователей Comment [comment] = [comment] + # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = Mod is incompatible with [modFilter] = Мод несовместим с [modFilter] # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Rusyn.properties b/android/assets/jsons/translations/Rusyn.properties index 86bf2f0038..3680a3f8aa 100644 --- a/android/assets/jsons/translations/Rusyn.properties +++ b/android/assets/jsons/translations/Rusyn.properties @@ -3726,6 +3726,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 870ac2b487..1a638b3209 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -2361,6 +2361,20 @@ upon ending a turn in a [tileFilter] tile = 在[tileFilter]地块上结束一回 upon discovering a [tileFilter] tile = 当发现[tileFilter]后 hidden from users = 对玩家隐藏 Comment [comment] = [comment] + # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = Mod is incompatible with [modFilter] = Mod与[modFilter]不兼容 Mod requires [modFilter] = Mod 需要 [modFilter] Should only be used as permanent audiovisual mod = 只能用作永久视听Mod diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index e648478eb1..e0c2f11cd0 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -2373,6 +2373,20 @@ upon ending a turn in a [tileFilter] tile = al terminar turno en una casilla de upon discovering a [tileFilter] tile = al descubrir una casilla de [tileFilter] hidden from users = oculto al jugador Comment [comment] = Comentario: [comment] + # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = Mod is incompatible with [modFilter] = Este mod es incompatible con [modFilter] Mod requires [modFilter] = El mod requiere [modFilter] Should only be used as permanent audiovisual mod = Sólo debería ser usado como mod audiovisual diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index 1036c6bed4..1a70ab74d6 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -2734,6 +2734,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 5cd2c503d5..59fb0596fc 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -2498,6 +2498,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 168c38e2ac..66dff9018c 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -2650,6 +2650,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 6c51b0f9f3..489cdf169d 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -2418,6 +2418,20 @@ upon discovering a [tileFilter] tile = # Requires translation! hidden from users = Comment [comment] = [comment] + # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = Mod is incompatible with [modFilter] = Мод несумісний із [modFilter] # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties index 9797972d19..761dcfdfe4 100644 --- a/android/assets/jsons/translations/Vietnamese.properties +++ b/android/assets/jsons/translations/Vietnamese.properties @@ -2714,6 +2714,20 @@ upon discovering a [tileFilter] tile = hidden from users = Comment [comment] = [comment] # Requires translation! +Diplomatic relationships cannot change = + # Requires translation! +Can convert gold to science with sliders = + # Requires translation! +Allow City States to spawn with additional units = + # Requires translation! +Can trade civilization introductions for [positiveAmount] Gold = + # Requires translation! +Disable religion = + # Requires translation! +Allow raze capital = + # Requires translation! +Allow raze holy city = + # Requires translation! Mod is incompatible with [modFilter] = # Requires translation! Mod requires [modFilter] = diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index bba870574a..f13fa3671c 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -7,7 +7,7 @@ Catalan = 98 Czech = 79 Dutch = 97 English = 0 -Filipino = 90 +Filipino = 89 Finnish = 38 French = 99 German = 99 @@ -23,7 +23,7 @@ Malay = 26 Persian_(Pinglish-DIN) = 12 Persian_(Pinglish-UN) = 27 Polish = 98 -Portuguese = 60 +Portuguese = 59 Romanian = 78 Russian = 97 Rusyn = 65 @@ -33,4 +33,4 @@ Swedish = 82 Traditional_Chinese = 94 Turkish = 80 Ukrainian = 96 -Vietnamese = 89 +Vietnamese = 88 diff --git a/changelog.md b/changelog.md index 1a26272276..f62bbb7100 100644 --- a/changelog.md +++ b/changelog.md @@ -4,11 +4,7 @@ Fixed crash due to ranged unit trying to capture civilian but being unable to re Added unit conditional support to pillage yield uniques -Added unit conditional support to pillage yield uniques - -By SomeTroglodyte: -- Fix ModOptions unique parameter types not checked and "uniquetype" ModOptionsConstants -- Policy picker colors skinnable +Policy picker colors are moddable - By SomeTroglodyte Players can't move spies when it is not their turn - By tuvus diff --git a/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt b/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt index 1a23ac107b..83f9286584 100644 --- a/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt +++ b/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt @@ -201,13 +201,13 @@ class WorkerAutomation( stopAndCleanAutomation() unit.civ.addNotification("Connect road failed!", currentTile.position, NotificationCategory.Units, NotificationIcon.Construction) return - } else { - pathToDest = foundPath // Convert to a list of positions for serialization - .map { it.position } + } + + pathToDest = foundPath // Convert to a list of positions for serialization + .map { it.position } - unit.automatedRoadConnectionPath = pathToDest - debug("WorkerAutomation: ${unit.label()} -> found connect road path to destination tile: %s, %s", destinationTile, pathToDest) - } + unit.automatedRoadConnectionPath = pathToDest + debug("WorkerAutomation: ${unit.label()} -> found connect road path to destination tile: %s, %s", destinationTile, pathToDest) } val currTileIndex = pathToDest.indexOf(currentTile.position) @@ -220,49 +220,46 @@ class WorkerAutomation( return } - if (unit.currentMovement > 0) { - /* Can not build a road on this tile, try to move on. - * The worker should search for the next furthest tile in the path that: - * - It can move to - * - Can be improved/upgraded - * */ - if (!shouldBuildRoadOnTile(currentTile)) { - when { - currTileIndex < pathToDest.size - 1 -> { // Try to move to the next tile in the path - val tileMap = unit.civ.gameInfo.tileMap - var nextTile: Tile = currentTile + /* Can not build a road on this tile, try to move on. + * The worker should search for the next furthest tile in the path that: + * - It can move to + * - Can be improved/upgraded + * */ + if (unit.currentMovement > 0 && !shouldBuildRoadOnTile(currentTile)) { + if (currTileIndex == pathToDest.size - 1) { // The last tile in the path is unbuildable or has a road. + stopAndCleanAutomation() + unit.civ.addNotification("Connect road completed!", currentTile.position, NotificationCategory.Units, unit.name) + return + } - // Create a new list with tiles where the index is greater than currTileIndex - val futureTiles = pathToDest.asSequence() - .dropWhile { it != unit.currentTile.position } - .drop(1) - .map { tileMap[it] } + if (currTileIndex < pathToDest.size - 1) { // Try to move to the next tile in the path + val tileMap = unit.civ.gameInfo.tileMap + var nextTile: Tile = currentTile - for (futureTile in futureTiles){ // Find the furthest tile we can reach in this turn, move to, and does not have a road - if (unit.movement.canReachInCurrentTurn(futureTile) && unit.movement.canMoveTo(futureTile)) { // We can at least move to this tile - nextTile = futureTile - if (shouldBuildRoadOnTile(futureTile)) { - break // Stop on this tile - } - } - } + // Create a new list with tiles where the index is greater than currTileIndex + val futureTiles = pathToDest.asSequence() + .dropWhile { it != unit.currentTile.position } + .drop(1) + .map { tileMap[it] } - unit.movement.moveToTile(nextTile) - currentTile = unit.getTile() - } - currTileIndex == pathToDest.size - 1 -> { // The last tile in the path is unbuildable or has a road. - stopAndCleanAutomation() - unit.civ.addNotification("Connect road completed!", currentTile.position, NotificationCategory.Units, unit.name) - return + for (futureTile in futureTiles) { // Find the furthest tile we can reach in this turn, move to, and does not have a road + if (unit.movement.canReachInCurrentTurn(futureTile) && unit.movement.canMoveTo(futureTile)) { // We can at least move to this tile + nextTile = futureTile + if (shouldBuildRoadOnTile(futureTile)) { + break // Stop on this tile + } } } + + unit.movement.moveToTile(nextTile) + currentTile = unit.getTile() } } // We need to check current movement again after we've (potentially) moved if (unit.currentMovement > 0) { // Repair pillaged roads first - if(currentTile.roadStatus != RoadStatus.None && currentTile.roadIsPillaged){ + if (currentTile.roadStatus != RoadStatus.None && currentTile.roadIsPillaged){ currentTile.setRepaired() return } diff --git a/fastlane/metadata/android/en-US/changelogs/965.txt b/fastlane/metadata/android/en-US/changelogs/965.txt index a582aa2621..ba1fb433b8 100644 --- a/fastlane/metadata/android/en-US/changelogs/965.txt +++ b/fastlane/metadata/android/en-US/changelogs/965.txt @@ -1,13 +1,7 @@ - - Fixed crash due to ranged unit trying to capture civilian but being unable to reach the tile Added unit conditional support to pillage yield uniques -Added unit conditional support to pillage yield uniques - -By SomeTroglodyte: -- Fix ModOptions unique parameter types not checked and "uniquetype" ModOptionsConstants -- Policy picker colors skinnable +Policy picker colors are moddable - By SomeTroglodyte Players can't move spies when it is not their turn - By tuvus \ No newline at end of file