diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 83f7f3ba15..f32341a8a9 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -7327,6 +7327,8 @@ Notified of new Barbarian encampments = # Requires translation! Triggers victory = # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties index 8c95c96d96..cda9945339 100644 --- a/android/assets/jsons/translations/Bulgarian.properties +++ b/android/assets/jsons/translations/Bulgarian.properties @@ -8824,6 +8824,8 @@ Notified of new Barbarian encampments = # Requires translation! Triggers victory = # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 77e7676add..ef526600e9 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -5413,6 +5413,8 @@ Production to science conversion in cities increased by 33% = Notified of new Barbarian encampments = Triggers victory = Vyvolá vítězství # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 7ea171fbe5..bfaa8d3d2a 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -7047,6 +7047,8 @@ Notified of new Barbarian encampments = # Requires translation! Triggers victory = # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index c35b2ef716..52873ddd1e 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -9620,6 +9620,8 @@ Notified of new Barbarian encampments = # Requires translation! Triggers victory = # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties index 11e8dd9b47..090003c540 100644 --- a/android/assets/jsons/translations/Filipino.properties +++ b/android/assets/jsons/translations/Filipino.properties @@ -9496,6 +9496,8 @@ Notified of new Barbarian encampments = # Requires translation! Triggers victory = # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index 83f313b09c..fdad2b7627 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -7736,6 +7736,8 @@ Notified of new Barbarian encampments = # Requires translation! Triggers victory = # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index a137e4fb9c..60bef96f0b 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -5355,6 +5355,8 @@ May buy [buildingFilter] buildings with [stat] for [amount] times their normal P Production to science conversion in cities increased by 33% = Conversion de la production en science dans les villes augmentée de 33% Notified of new Barbarian encampments = Notification pour les nouveaux campements Barbares Triggers victory = Déclenche la victoire + # Requires translation! +Starts with [policy] adopted = [amount] Unit Supply = [amount] Appro. Unités [amount] Unit Supply per [amount2] population [cityFilter] = [amount] Appro. Unités tous les [amount2] citoyens [cityFilter] [amount] Unit Supply per city = [amount] Appro. Unités par ville diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index cf85546fac..5f9442c21e 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -5351,6 +5351,8 @@ May buy [buildingFilter] buildings with [stat] for [amount] times their normal P Production to science conversion in cities increased by 33% = Umwandlung von Produktion in Wissenschaft in allen Städten um 33% erhöht Notified of new Barbarian encampments = Benachrichtigt über neue Barbarenlager Triggers victory = Löst den Sieg aus + # Requires translation! +Starts with [policy] adopted = [amount] Unit Supply = [amount] Einheitenversorgung [amount] Unit Supply per [amount2] population [cityFilter] = [amount] Einheitenversorgung je [amount2] Bevölkerung [cityFilter] [amount] Unit Supply per city = [amount] Einheitenversorgung je Stadt diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties index 32f51279fc..5c5d514d60 100644 --- a/android/assets/jsons/translations/Greek.properties +++ b/android/assets/jsons/translations/Greek.properties @@ -9018,6 +9018,8 @@ Notified of new Barbarian encampments = # Requires translation! Triggers victory = # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index 179cf4f5b8..1b30a377bd 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -7310,6 +7310,8 @@ Notified of new Barbarian encampments = # Requires translation! Triggers victory = # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 073a4fbf63..f71f4091ae 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -5351,6 +5351,8 @@ May buy [buildingFilter] buildings with [stat] for [amount] times their normal P Production to science conversion in cities increased by 33% = Konversi produksi menjadi ilmu pengetahuan di kota-kota meningkat sebesar 33% Notified of new Barbarian encampments = Diberitahu tentang perkemahan orang Barbar baru Triggers victory = Memicu kemenangan + # Requires translation! +Starts with [policy] adopted = [amount] Unit Supply = [amount] Persediaan Unit [amount] Unit Supply per [amount2] population [cityFilter] = [amount] Persediaan Unit per [amount2] populasi [cityFilter] [amount] Unit Supply per city = [amount] Persediaan Unit per kota diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index c26d337c60..a0b923cac4 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -5355,6 +5355,8 @@ May buy [buildingFilter] buildings with [stat] for [amount] times their normal P Production to science conversion in cities increased by 33% = +33% di conversione Produzione in Scienza nelle città Notified of new Barbarian encampments = Riceverai notifiche su nuovi accampamenti barbari Triggers victory = Attiva la vittoria + # Requires translation! +Starts with [policy] adopted = [amount] Unit Supply = [amount] rifornimento unità [amount] Unit Supply per [amount2] population [cityFilter] = [amount] rifornimento unità ogni [amount2] abitanti [cityFilter] [amount] Unit Supply per city = [amount] rifornimento unità per città diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 0ac21fd3d3..4b3eff64fd 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -6190,6 +6190,8 @@ Production to science conversion in cities increased by 33% = # Requires translation! Notified of new Barbarian encampments = Triggers victory = 勝利を収める + # Requires translation! +Starts with [policy] adopted = [amount] Unit Supply = [amount]ユニットサプライ [amount] Unit Supply per [amount2] population [cityFilter] = [cityFilter]人口[amount2]人あたり[amount]ユニットサプライ # Requires translation! diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index c07f5cc921..13db3e440e 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -5385,6 +5385,8 @@ May buy [buildingFilter] buildings with [stat] for [amount] times their normal P Production to science conversion in cities increased by 33% = Notified of new Barbarian encampments = 야만인 주둔지 생성시 알림 Triggers victory = 승리를 유발함 + # Requires translation! +Starts with [policy] adopted = [amount] Unit Supply = 보급품 [amount] [amount] Unit Supply per [amount2] population [cityFilter] = [cityFilter]의 인구 [amount2]당 보급품 [amount] [amount] Unit Supply per city = 도시 하나당 보급품 [amount] diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index 554bd0d490..ae79b6e183 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -8854,6 +8854,8 @@ Notified of new Barbarian encampments = # Requires translation! Triggers victory = # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index cff60036bb..c0fb17b172 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -8351,6 +8351,8 @@ Notified of new Barbarian encampments = # Requires translation! Triggers victory = # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index 038b529f92..a87d335d4f 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -8871,6 +8871,8 @@ Notified of new Barbarian encampments = # Requires translation! Triggers victory = # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index ddf6080ec9..d87ca6e339 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -8868,6 +8868,8 @@ Notified of new Barbarian encampments = # Requires translation! Triggers victory = # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 729c4f5e1a..d49c5acc8a 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -6357,6 +6357,8 @@ Notified of new Barbarian encampments = # Requires translation! Triggers victory = # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 726aceab79..983beee150 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -6972,6 +6972,8 @@ Notified of new Barbarian encampments = # Requires translation! Triggers victory = # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 4dd2fb2ef2..12c21b522f 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -8278,6 +8278,8 @@ Notified of new Barbarian encampments = # Requires translation! Triggers victory = # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index afcfde39dc..604c85015f 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -5390,6 +5390,8 @@ May buy [buildingFilter] buildings with [stat] for [amount] times their normal P Production to science conversion in cities increased by 33% = Notified of new Barbarian encampments = Оповещает о новых лагерях варваров Triggers victory = Приводит к победе + # Requires translation! +Starts with [policy] adopted = [amount] Unit Supply = [amount] к снабжению юнита [amount] Unit Supply per [amount2] population [cityFilter] = [amount] к снабжению юнита за каждые [amount2] населения [cityFilter] [amount] Unit Supply per city = [amount] к снабжению юнита за каждый город diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 060830e760..bddbc800d4 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -5381,6 +5381,8 @@ Production to science conversion in cities increased by 33% = 对科学的产能 Notified of new Barbarian encampments = 会对新出现蛮族营地提醒 Triggers victory = 触发胜利 # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 053e543748..9de69049a3 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -548,7 +548,6 @@ Show unit movement arrows = Mostrar flechas de movimiento de únidad Continuous rendering = Renderizado Continuo When disabled, saves battery life but certain animations will be suspended = Cuando está deshabilitado, ahorra batería pero ciertas animaciones serán suspendidas Order trade offers by amount = Organizar ofertas por cantidad - # Requires translation! Check extension mods based on: = Chequear Mods de Extensión basados en: -none- = -nada- Reload mods = recargar mods @@ -5352,6 +5351,8 @@ May buy [buildingFilter] buildings with [stat] for [amount] times their normal P Production to science conversion in cities increased by 33% = La conversión de la producción a la ciencia en las ciudades aumentó un 33 % Notified of new Barbarian encampments = Serás avisado de nuevos campamentos Bárbaros Triggers victory = desencadena la victoria + # Requires translation! +Starts with [policy] adopted = [amount] Unit Supply = [amount] Suministro de unidades [amount] Unit Supply per [amount2] population [cityFilter] = [amount] Unidad Suministro por [amount2] población [cityFilter] [amount] Unit Supply per city = [amount] Suministro de unidades por ciudad diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index e903967c87..8c8f1dfb95 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -5415,6 +5415,8 @@ Production to science conversion in cities increased by 33% = Notified of new Barbarian encampments = Triggers victory = Leder till seger # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index cdbcd6290e..885f7d06ad 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -6758,6 +6758,8 @@ Notified of new Barbarian encampments = # Requires translation! Triggers victory = # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 50365469f5..c30015320f 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -6213,6 +6213,8 @@ Notified of new Barbarian encampments = # Requires translation! Triggers victory = # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 3528647f28..1868658fbd 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -5797,6 +5797,8 @@ Notified of new Barbarian encampments = # Requires translation! Triggers victory = # Requires translation! +Starts with [policy] adopted = + # Requires translation! [amount] Unit Supply = # Requires translation! [amount] Unit Supply per [amount2] population [cityFilter] = diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 740f6dfa92..5873dbd3db 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -1,14 +1,14 @@ Persian_(Pinglish-UN) = 17 Italian = 99 Russian = 98 -German = 100 +German = 99 Swedish = 97 Turkish = 78 Ukrainian = 87 Filipino = 2 French = 99 Portuguese = 60 -Indonesian = 100 +Indonesian = 99 Finnish = 43 Spanish = 99 Malay = 29 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 3b518bb4d3..8a63d65710 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -3,8 +3,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.5.30" const val appName = "Unciv" - const val appCodeNumber = 685 - const val appVersion = "3.19.14-patch1" + const val appCodeNumber = 686 + const val appVersion = "3.19.15" const val gdxVersion = "1.10.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index a6f64dd425..cf8b8174a2 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,19 @@ +## 3.19.15 + +By SomeTroglodyte: +- UI improvements of Religion Picker Screen +- Better Notification locations +- Code cleanup +- Fix Mughal Fort unique + +By itanasi: +- Return Stacking Terrain Bonus to Civ5 Rules + +By lishaoxia1985: +- UI improvements + +Added "Starts with [policy] adopted" unique - By HaneulCheong + ## 3.19.14 By SomeTroglodyte: diff --git a/docs/Modders/uniques.md b/docs/Modders/uniques.md index 6a2bdc1a7c..aebe1e3f05 100644 --- a/docs/Modders/uniques.md +++ b/docs/Modders/uniques.md @@ -780,6 +780,11 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl Applicable to: Nation +??? example "Starts with [policy] adopted" + Example: "Starts with [Oligarchy] adopted" + + Applicable to: Nation + ## Tech uniques ??? example "Starting tech" Applicable to: Tech