diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index a4962dafea..a8074b811b 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -580,6 +580,8 @@ The city will not produce anything. = A cidade não vai produzir nada. Worked by [cityName] = Trabalhado por [cityName] Lock = Trancar Unlock = Destrancar + # Requires translation! +Move to city = # Technology UI @@ -1034,7 +1036,6 @@ Terracotta Army = Exército de Terracota Temple = Templo -Doubles Gold given to enemy if city is captured = Duplica o ouro dado ao inimigo caso a cidade seja capturada. Burial Tomb = Tumba Mud Pyramid Mosque = Mesquita da Piramide de Barro diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 987cea087b..a860e5f090 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -575,6 +575,8 @@ The city will not produce anything. = Město nebude nic vyrábět. Worked by [cityName] = Obděláváno městem [cityName] Lock = Uzamknout Unlock = Odemknout + # Requires translation! +Move to city = # Technology UI @@ -1022,7 +1024,6 @@ Terracotta Army = Terakotová armáda Temple = Chrám -Doubles Gold given to enemy if city is captured = Dvojnásobný zisk zlata při obsazení města nepřítelem Burial Tomb = Hrobka Mud Pyramid Mosque = Hliněná pyramidová mešita diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 5675df770d..587b53c67b 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -741,6 +741,8 @@ Worked by [cityName] = Lock = # Requires translation! Unlock = + # Requires translation! +Move to city = # Technology UI @@ -1497,8 +1499,6 @@ Terracotta Army = Temple = Tempel - # Requires translation! -Doubles Gold given to enemy if city is captured = Burial Tomb = Graftombe # Requires translation! diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index b7fd9dd696..461825d8e9 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -1085,6 +1085,8 @@ Worked by [cityName] = Lock = # Requires translation! Unlock = + # Requires translation! +Move to city = # Technology UI @@ -1880,8 +1882,6 @@ Terracotta Army = # Requires translation! Temple = - # Requires translation! -Doubles Gold given to enemy if city is captured = # Requires translation! Burial Tomb = diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index 8f1baf5c60..b8bbd6d4f2 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -602,6 +602,8 @@ The city will not produce anything. = Kaupunki ei tuota mitään Worked by [cityName] = [cityName] työstää Lock = Lukitse Unlock = Poista lukitus + # Requires translation! +Move to city = # Technology UI @@ -1120,7 +1122,6 @@ Terracotta Army = Terrakotta-armeija Temple = Temppeli -Doubles Gold given to enemy if city is captured = Tuplaa valloittajalle annetun Kullan jos kaupunki vallataan Burial Tomb = Hautakammio Mud Pyramid Mosque = Askian hauta diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 8defca1db1..96f2a3b3d8 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -594,6 +594,8 @@ The city will not produce anything. = La cité ne produira plus rien Worked by [cityName] = Lock = Verouiller Unlock = Déverouiller + # Requires translation! +Move to city = # Technology UI @@ -1118,7 +1120,6 @@ Terracotta Army = Armée de Terre Cuite Temple = Temple -Doubles Gold given to enemy if city is captured = Double l'Or donné à un ennemi si une cité est capturée Burial Tomb = Tombeau Mud Pyramid Mosque = Mosquée Pyramidale de Terre diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 90f360ee50..6758635962 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -575,6 +575,8 @@ The city will not produce anything. = Die Stadt produziert nichts. Worked by [cityName] = Bewirtschaftet von [cityName] Lock = Sperren Unlock = Entsperren + # Requires translation! +Move to city = # Technology UI @@ -1022,7 +1024,6 @@ Terracotta Army = Terrakotta-Armee Temple = Tempel -Doubles Gold given to enemy if city is captured = Verdoppelt die Menge an Gold für den Feind, falls die Stadt erorbert wird Burial Tomb = Grabstätte Mud Pyramid Mosque = Lehmmoschee diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index 98e2255f27..dea339a208 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -576,6 +576,8 @@ The city will not produce anything. = A város nem termel semmit. Worked by [cityName] = Megmunkálva [cityName] város által Lock = Lezár Unlock = Felold + # Requires translation! +Move to city = # Technology UI @@ -1034,7 +1036,6 @@ Terracotta Army = Agyaghadsereg Temple = Templom -Doubles Gold given to enemy if city is captured = Megduplázza az arany mennyiségét amit az ellenség kap ha a várost elfoglalják Burial Tomb = Sírkamra Mud Pyramid Mosque = Vályogpiramis diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index b11c1d71c1..2d401a0f36 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -573,6 +573,8 @@ The city will not produce anything. = Kota ini tidak akan memproduksi apapun. Worked by [cityName] = Dikerjakan oleh [cityName] Lock = Kunci Unlock = Buka + # Requires translation! +Move to city = # Technology UI @@ -1018,7 +1020,6 @@ Terracotta Army = Pasukan Terakota Temple = Kuil -Doubles Gold given to enemy if city is captured = Dua kali Emas dari biasanya diberikan ke musuh jika kota dikuasai Burial Tomb = Pemakaman Mud Pyramid Mosque = Masjid Piramida Lumpur diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index c629f02de5..70e97b49de 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -573,6 +573,8 @@ The city will not produce anything. = La città non produrrà nulla Worked by [cityName] = Sfruttata da [cityName] Lock = Blocca Unlock = Sblocca + # Requires translation! +Move to city = # Technology UI @@ -1018,7 +1020,6 @@ Terracotta Army = Esercito di terracotta Temple = Tempio -Doubles Gold given to enemy if city is captured = Raddoppia la quantità d'Oro saccheggiato se la città viene conquistata. Burial Tomb = Sepolcro Mud Pyramid Mosque = Moschea della piramide di fango diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 770d711fe8..0daf54b296 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -573,6 +573,8 @@ The city will not produce anything. = 都市は何も生産しません Worked by [cityName] = [cityName]で勤務 Lock = ロック Unlock = アンロック + # Requires translation! +Move to city = # Technology UI @@ -964,7 +966,6 @@ Floating Gardens = 水上庭園 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.' - Robert Louis Stevenson = 「森が人間の心に訴えかけてくる理由はその美しさではなく、もっと漠然とした何かであり、その空気の質であり、古い木々の息づかいであり、不思議なほど人間の心を癒やしてくれるからである」 - ロバート・ルイス・スティーブンソン +[amount]% growth in all cities = 全都市の成長速度+[amount]% - # Requires translation! +[amount]% Production when constructing [unitType] units = [unitType]生産時に生産力+[amount]% Temple of Artemis = アルテミス神殿 @@ -1019,7 +1020,6 @@ Terracotta Army = 兵馬俑 Temple = 寺院 -Doubles Gold given to enemy if city is captured = 都市を占領した文明がゴールドを2倍得る Burial Tomb = 陵墓 Mud Pyramid Mosque = 泥のピラミッド状モスク @@ -1882,7 +1882,6 @@ What now? = 本日のご用件は? So, out with it! = ああ、聞いているぞ! Furor Teutonicus = 怒れるテウトネス 67% chance to earn 25 Gold and recruit a Barbarian unit from a conquered encampment = 野営地を征服すると67%の確率で25ゴールドを獲得し、蛮族ユニットを自軍に加える - # Requires translation! -[amount]% [param] unit maintenance costs = [param]ユニットの維持コスト-[amount]% Berlin = ベルリン Hamburg = ハンブルク @@ -1994,7 +1993,6 @@ Welcome to the palace of Choson, stranger. I am the learned King Sejong, who loo We have many things to discuss and have much to benefit from each other. = 話し合うことで、お互いに得をすることがたくさんあるぞ。 Oh, it's you = ああ、そなたか Scholars of the Jade Hall = 翡翠の間の学者たち - # Requires translation! Receive a tech boost when scientific buildings/wonders are built in capital = 首都に科学関連の建造物/文化財が建設されると、技術力のブーストを得る。 Seoul = ソウル Busan = 釜山 diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index d2df1e8ae1..396329ecd0 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -573,6 +573,8 @@ The city will not produce anything. = 도시가 아무 것도 생산하지 않 Worked by [cityName] = [cityName]에서 작업중 Lock = 잠금 Unlock = 해제 + # Requires translation! +Move to city = # Technology UI @@ -1022,7 +1024,6 @@ Terracotta Army = 병마용 Temple = 사원 -Doubles Gold given to enemy if city is captured = 도시가 점령되었을 때 적에게 주어지는 점령금 두 배 Burial Tomb = 왕릉 Mud Pyramid Mosque = 진흙 피라미드 모스크 diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index e1b67b3544..d4c2f74a6c 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -616,6 +616,8 @@ Worked by [cityName] = Dirbo [cityName] Lock = # Requires translation! Unlock = + # Requires translation! +Move to city = # Technology UI @@ -1201,8 +1203,6 @@ Terracotta Army = # Requires translation! Temple = - # Requires translation! -Doubles Gold given to enemy if city is captured = # Requires translation! Burial Tomb = diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 798079de93..dc6de48d39 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -983,6 +983,8 @@ Worked by [cityName] = Lock = # Requires translation! Unlock = + # Requires translation! +Move to city = # Technology UI @@ -1743,8 +1745,6 @@ Terracotta Army = Temple = Kuil - # Requires translation! -Doubles Gold given to enemy if city is captured = Burial Tomb = Tempat Persemadian # Requires translation! diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index d9658848b1..7cf66b9995 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -602,6 +602,8 @@ The city will not produce anything. = In šahr čizi tolid naḵāhad kard. Worked by [cityName] = Dar dast e ejrā dar [cityName] Lock = Ğofl kardan Unlock = Bāz kardan + # Requires translation! +Move to city = # Technology UI @@ -1135,8 +1137,6 @@ Terracotta Army = # Requires translation! Temple = - # Requires translation! -Doubles Gold given to enemy if city is captured = # Requires translation! Burial Tomb = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index 3432c60d62..cc36a36e5f 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -599,6 +599,8 @@ The city will not produce anything. = In shahr chizi tolid nakhaahad kard. Worked by [cityName] = Dar dast e ejraa dar [cityName] Lock = Ghofl kardan Unlock = Baaz kardan + # Requires translation! +Move to city = # Technology UI @@ -1132,8 +1134,6 @@ Terracotta Army = # Requires translation! Temple = - # Requires translation! -Doubles Gold given to enemy if city is captured = # Requires translation! Burial Tomb = diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 08bbf6419b..bc33f91b25 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -579,6 +579,8 @@ The city will not produce anything. = To miasto nic nie wyprodukuje. Worked by [cityName] = Obrabiane przez [cityName] Lock = Zablokuj Unlock = Odblokuj + # Requires translation! +Move to city = # Technology UI @@ -1044,7 +1046,6 @@ Terracotta Army = Terakotowa Armia Temple = Świątynia -Doubles Gold given to enemy if city is captured = Podwaja przeciwnikowi złoto, jeśli miasto jest zdobyte Burial Tomb = Grobowiec Mud Pyramid Mosque = Meczet z Piramidą diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 127cf049cf..1640078f2d 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -619,6 +619,8 @@ Worked by [cityName] = Lock = # Requires translation! Unlock = + # Requires translation! +Move to city = # Technology UI @@ -1207,8 +1209,6 @@ Terracotta Army = Exército de Terracota Temple = Templo - # Requires translation! -Doubles Gold given to enemy if city is captured = Burial Tomb = Tumba # Requires translation! diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 880fca44d7..08c60c40f4 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -615,6 +615,8 @@ Worked by [cityName] = Lock = # Requires translation! Unlock = + # Requires translation! +Move to city = # Technology UI @@ -1212,7 +1214,6 @@ Terracotta Army = Armată de teracotă Temple = Templu -Doubles Gold given to enemy if city is captured = Dublează aurul dat inamicului dacă orașul este capturat Burial Tomb = Loc de veci Mud Pyramid Mosque = Moscheea Piramidă de Nămol diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index c60f23ede8..0c02fffa98 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -576,6 +576,8 @@ The city will not produce anything. = Город ничего не будет п Worked by [cityName] = Обрабатывается в г. [cityName] Lock = Блокировать Unlock = Разблокировать + # Requires translation! +Move to city = # Technology UI @@ -1024,7 +1026,6 @@ Terracotta Army = Терракотовая армия Temple = Храм -Doubles Gold given to enemy if city is captured = Враг получает удвоеное количество золота при захвате города Burial Tomb = Гробница Mud Pyramid Mosque = Глиняная мечеть diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 79bfff231b..205b7dedb5 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -573,6 +573,8 @@ The city will not produce anything. = 城市将不会建造/组建任何项目 Worked by [cityName] = 被[cityName]开发 Lock = 锁定 Unlock = 解锁 + # Requires translation! +Move to city = # Technology UI @@ -1026,7 +1028,6 @@ Terracotta Army = 兵马俑 Temple = 神庙 -Doubles Gold given to enemy if city is captured = 当敌方占领城市时他们将得到双倍金钱 Burial Tomb = 陵墓 Mud Pyramid Mosque = 土塔清真寺 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 74a9545321..7985dfc2d5 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -573,6 +573,8 @@ The city will not produce anything. = La ciudad no producirá nada. Worked by [cityName] = Trabajado por [cityName] Lock = Bloqueado Unlock = Desbloqueado + # Requires translation! +Move to city = # Technology UI @@ -1020,7 +1022,6 @@ Terracotta Army = Ejército de terracota Temple = Templo -Doubles Gold given to enemy if city is captured = Dobla la cantidad de oro que se da al enemigo si la ciudad es capturada Burial Tomb = Tumba Mud Pyramid Mosque = Mezquita piramidal diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 4e197b17a6..a170b2d50d 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -600,6 +600,8 @@ The city will not produce anything. = 城市將不會建造/訓練任何項目 Worked by [cityName] = 被[cityName]開發 Lock = 鎖定 Unlock = 解鎖 + # Requires translation! +Move to city = # Technology UI @@ -1082,7 +1084,6 @@ Terracotta Army = 兵馬俑 Temple = 神廟 -Doubles Gold given to enemy if city is captured = 當敵方佔領城市時他們將得到雙倍金錢 Burial Tomb = 陵墓 Mud Pyramid Mosque = 土塔清真寺 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 65dade7dd9..1516302d49 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -605,6 +605,8 @@ Worked by [cityName] = Lock = # Requires translation! Unlock = + # Requires translation! +Move to city = # Technology UI @@ -1123,7 +1125,6 @@ Terracotta Army = Terracotta Ordusu Temple = Tapınak -Doubles Gold given to enemy if city is captured = Şehir ele geçirilirse düşmana verilen Altın'ı iki katına çıkarır Burial Tomb = Mezar Mud Pyramid Mosque = Çamur Piramidi Camii diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 86cd67b7ea..08bc93e2de 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -581,6 +581,8 @@ The city will not produce anything. = Місто не буде нічого ви Worked by [cityName] = Працівник міста [cityName] Lock = Заблокувати Unlock = Розблокувати + # Requires translation! +Move to city = # Technology UI @@ -1034,7 +1036,6 @@ Terracotta Army = Терракотова армія Temple = Храм -Doubles Gold given to enemy if city is captured = Ворог отримує подвійну кількість золота, якщо місто було захоплено Burial Tomb = Гробниця Mud Pyramid Mosque = Глиняна пірамідальна мечеть diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 87520503d9..469dcf748d 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -6,7 +6,7 @@ Turkish = 71 Ukrainian = 98 French = 90 Portuguese = 46 -Indonesian = 100 +Indonesian = 99 Finnish = 60 Spanish = 99 Malay = 11 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 7e30860a3b..0ea86d45da 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.3.71" const val appName = "Unciv" - const val appCodeNumber = 511 - const val appVersion = "3.12.1" + const val appCodeNumber = 512 + const val appVersion = "3.12.2" const val gdxVersion = "1.9.12" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index b98f142f24..16a79dc64f 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,21 @@ +## 3.12.2 + +Resolved #3422 - added fast switch between adjacent cities in city screen + +Resolved #3428 - added a toggle for displaying yield icons + +Resolved #3427 - "player ready" screen appears when loading game in Hotseat multiplayer + +City-states make peace with enemies when their allies do + +Long tech descriptions are now scrollable + +"Requires a {building}" notifications show the civ's equivalent to the building, if overridden + +Korean UA activates on buildings added from buying and on national wonders + +Translation updates + ## 3.12.1 By nob0dy73: