From 288e6877ba5b3a700d5f13a9383f3c5448ccc5e1 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 17 Jun 2020 20:05:55 +0300 Subject: [PATCH] 3.9.4 --- .../Brazilian_Portuguese.properties | 2 ++ .../jsons/translations/Czech.properties | 2 ++ .../jsons/translations/Dutch.properties | 2 ++ .../jsons/translations/English.properties | 2 ++ .../jsons/translations/French.properties | 2 ++ .../jsons/translations/German.properties | 2 ++ .../jsons/translations/Indonesian.properties | 22 ++----------------- .../jsons/translations/Italian.properties | 2 ++ .../jsons/translations/Japanese.properties | 3 ++- .../jsons/translations/Korean.properties | 2 ++ .../jsons/translations/Lithuanian.properties | 2 ++ .../jsons/translations/Malay.properties | 2 ++ .../jsons/translations/Polish.properties | 2 ++ .../jsons/translations/Portuguese.properties | 2 ++ .../jsons/translations/Romanian.properties | 2 ++ .../jsons/translations/Russian.properties | 2 ++ .../Simplified_Chinese.properties | 2 ++ .../jsons/translations/Spanish.properties | 2 ++ .../Traditional_Chinese.properties | 2 ++ .../jsons/translations/Turkish.properties | 2 ++ .../jsons/translations/Ukrainian.properties | 2 ++ .../completionPercentages.properties | 10 ++++----- buildSrc/src/main/kotlin/BuildConfig.kt | 4 ++-- changelog.md | 12 ++++++++++ 24 files changed, 61 insertions(+), 28 deletions(-) diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index d6f2b4e2..d04f9461 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -3893,6 +3893,8 @@ Remove Railroad = Remover ferrovia Cancel improvement order = Cancelar ordem de melhoria + # Requires translation! +Great improvement = Academy = Academia Landmark = Monumento diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 63be957d..0da04ba3 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -4012,6 +4012,8 @@ Remove Railroad = Odstranit železnici Cancel improvement order = Zrušit vylepšování + # Requires translation! +Great improvement = Academy = Akademie Landmark = Dominanta diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 0c45dc4c..20839458 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -5130,6 +5130,8 @@ Remove Railroad = # Requires translation! Cancel improvement order = + # Requires translation! +Great improvement = Academy = Academie Landmark = Mijlpaal diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 1f31f3b5..9c9d50df 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -5484,6 +5484,8 @@ Remove Railroad = # Requires translation! Cancel improvement order = + # Requires translation! +Great improvement = # Requires translation! Academy = diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 4d18d46c..4d64c65e 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -2971,6 +2971,8 @@ Remove Railroad = Retirer les rails Cancel improvement order = Annuler l'ordre d'aménagement + # Requires translation! +Great improvement = Academy = Académie Landmark = Monument culturel diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 38017536..465e356c 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -2967,6 +2967,8 @@ Remove Railroad = Entferne Schienen Cancel improvement order = Stoppt Verbesserungsanweisung + # Requires translation! +Great improvement = Academy = Akademie Landmark = Sehenswürdigkeit diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 7ff02e47..ec0bde71 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -245,7 +245,6 @@ Great Andean Road = Jalan Andes Raya +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = +1 Pergerakan untuk semua unit yang melaut, unit hanya memerlukan 1 pergerakan untuk melaut dan mendarat. Unit jarak dekat tidak menghabiskan pergerakan untuk menjarah. Viking Fury = Kemarahan Viking - # Requires translation! Sacrificial Captives = Pengorbanan Tawanan Gain Culture for the empire from each enemy unit killed = Mendapat Budaya untuk kerajaan dari setiap unit musuh yang terbunuh. @@ -821,34 +820,21 @@ Research Agreements = Perjanjian Riset Player settings = Pengaturan pemain Base Happiness = Dasar Kebahagiaan Happiness per luxury = Kebahagiaan per barang tersier - # Requires translation! Research cost modifier = Pengatur biaya riset - # Requires translation! Unit cost modifier = Pengatur biaya unit - # Requires translation! Building cost modifier = Pengatur biaya bangunan - # Requires translation! Policy cost modifier = Pengatur biaya kebijakan - # Requires translation! Unhappiness modifier = Pengatur ketidakbahagiaan Bonus vs. Barbarians = Bonus vs Orang Barbar AI settings = Pengaturan AI - # Requires translation! AI city growth modifier = Pengatur pertumbuhan kota AI - # Requires translation! AI unit cost modifier = Pengatur biaya unit AI - # Requires translation! AI building cost modifier = Pengatur biaya bangunan AI - # Requires translation! AI wonder cost modifier = Pengatur biaya keajaiban dunia AI - # Requires translation! AI building maintenance modifier = Pengatur biaya pemeliharaan bangunan AI - # Requires translation! AI unit maintenance modifier = Pengatur biaya pemeliharaan unit AI - # Requires translation! AI unhappiness modifier = Pengatur ketidakbahagiaan AI - # Requires translation! AIs exchange techs = Pertukaran teknologi AI Turns until barbarians enter player tiles = Giliran hingga orang barbar memasuki daerah pemain @@ -2706,7 +2692,6 @@ Philosophy = Filosofi Currency = Mata Uang 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Lebih baik sepotong roti dengan hati yang senang daripada kekayaan dengan kejengkelan.' - Amenemope Engineering = Keinsinyuran - # Requires translation! Roads connect tiles across rivers = Pembangunan jalan menghubungkan daerah yang terpisah oleh sungai 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'Ilmu pengetahuan instrumental atau mekanikal adalah yang paling luhur dan, di atas semuanya, yang paling berguna.' - Leonardo da Vinci Iron Working = Pertukangan Besi @@ -2953,6 +2938,8 @@ Remove Railroad = Hancurkan Rel Kereta Cancel improvement order = Batalkan perintah improvisasi + # Requires translation! +Great improvement = Academy = Akademi Landmark = Landmark @@ -3476,9 +3463,7 @@ Cities can be conquered by reducing their health to 1, and entering the city wit Luxury resources within your domain and with their specific improvement are connected to your trade network.\nEach unique Luxury resource you have adds 5 happiness to your civilization, but extra resources of the same type don't add anything, so use them for trading with other civilizations! = Sumber daya tersier dalam kuasamu dengan improvisasi khususnya terkoneksi ke jaringan perdaganganmu.\nSetiap sumber daya tersier unik yang kamu punya menambah 5 kebahagiaan ke peradabanmu, tetapi kelebihan sumber daya tersier yang sama tidak menambah apa-apa, jadi tawarkan itu kepada peradaban lain. - # Requires translation! Strategic resources within your domain and with their specific improvement are connected to your trade network.\nStrategic resources allow you to train units and construct buildings that require those specific resources, for example the Horseman requires Horses. = Sumber daya strategis di dalam genggaman dan dengan improvisasi khususnya terkoneksi ke jaringan perdagangan.\nSumber daya strategis memampukan kamu untuk membuat unit dan membangun bangunan yang memerlukan sumber daya khusus, sebagai contoh: Pasukan Berkuda membutuhkan Kuda. - # Requires translation! Unlike Luxury Resources, each Strategic Resource on the map provides more than oneof that resource.\nThe top bar keeps count of how many unused strategic resources you own.\nA full drilldown of resources is available in the Resources tab in the Overview screen. = Berbeda dengan sumber daya tersier, setiap sumber daya strategis di peta menyediakan lebih dari satu barang.\nDi atas layar tertera jumlah sumber daya strategis yang kamu punya dan belum dipakai.\nDaftar selengkapnya tersedia di tab Sumber Daya di dalam tampilan Selengkapnya. The city can no longer put up any resistance!\nHowever, to conquer it, you must enter the city with a melee unit = Kota tidak bisa lagi memberi perlawanan!\nAkan tetapi, untuk menaklukkannya, kamu harus masuk ke kota dengan unit jarak dekat. @@ -3522,14 +3507,11 @@ Not all nations are contending with you for victory.\nCity-states are nations th Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = Akan tetapi, relasi diplomatik dengan negara kota ditentukan dengan Pengaruh - sebuah meteran yang menunjukkan sejauh apa negara kota itu menyukai kamu.\nPengaruh dapat ditingkatkan dengan menyerang musuh mereka, memerdekakan kota mereka, dan memberikan mereka sejumlah emas. Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = Bonus tertentu diberikan ketika kamu memiliki pengaruh di atas 30.\nKetika kamu memiliki 60 Pengaruh dan kamu punya pengaruh terbesar dengan mereka di atas peradaban lain, kamu dianggap sebagai 'Sekutu' dan mendapat bonus lebih lanjut serta akses ke sumber daya Tersier dan Strategis yang berada di tanah mereka. - # Requires translation! Certain buildings, and specialists in cities, generate Great Person points per turn.\nThere are several types of Great People, and their points accumulate separately.\nThe number of points per turn and accumulated points can be viewed in the Overview screen. = Bangunan tertentu, dan spesialis-spesialis di kota, menghasilkan poin Orang Hebat tiap giliran.\nAda beberapa jenis Orang Hebat, dan poinnya dikumpulkan berdasarkan jenisnya.\nJumlah poin tiap giliran serta total poin yang terkumpul dapat dilihat dalam tampilan Selengkapnya. - # Requires translation! Once enough points have been accumulaated, a Great Person of that type will be created!\nEach Great Person can construct a certain Great Improvement which gives large yields over time, or immediately consumed to provide a certain bonus now. = Ketika jumlah poin yang terkumpul telah mencukupi, seorang Orang Hebat sesuai jenisnya akan lahir!\nSetiap Orang Hebat dapat membangun Improvisasi Hebat tertentu yang memberikan hasil besar seiring waktu, atau dapat dipakai langsung untuk menyediakan bonus tertentu saat itu juga. # Requires translation! Great Improvements also provide any strategic resources that are under them, so you don't need to worry if resources are revealed underneath your improvements! = - # Requires translation! Certain tiles have terrain features - like Flood plains or Forests - on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = Daerah tertentu memiliki fitur-fitur - seperti Dataran Banjir atau Hutan - di dalamnya. Beberapa daerah yang berlapis, seperti Hutan, Rawa, dan Hutan, dapat disingkirkan oleh para pekerja.\nMenyingkirkan fitur-fitur tersebut tidak menghilangkan sumber daya apapun di daerah itu, dan biasanya hal ini diperlukan untuk mengerjakan sumber daya tersebut. Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = Keajaiban Alam, seperti Gn. Fuji, Batu Gibraltar, dan Karang Penghalang Besar merupakan hal istimewa, sebuah fitur yang tidak bisa dilewati, karya agung Tuhan, yang memiliki kualitas unik yang membuat mereka berbeda dari medan biasa.\nMereka memberi keuntungan dengan menghasilkan sejumlah Budaya, Ilmu Pengetahuan, Emas atau Produksi yang cukup besar jika dikerjakan oleh kota. Itulah mengapa kamu mungkin perlu untuk menguasai mereka dalam peradabanmu secepat mungkin. diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index d2776460..554c109b 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -2938,6 +2938,8 @@ Remove Railroad = Rimuovi Ferrovia Cancel improvement order = Annulla ordine miglioramento + # Requires translation! +Great improvement = Academy = Accademia Landmark = Punto di riferimento diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index ec56230c..a8f8b922 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -1760,7 +1760,6 @@ Kyoto = 京都 Osaka = 大阪 Tokyo = 東京 Satsuma = 薩摩 - # Requires translation! Kagoshima = 鹿児島 Nara = 奈良 Nagoya = 名古屋 @@ -2939,6 +2938,8 @@ Remove Railroad = 鉄道削除 Cancel improvement order = 建設をキャンセル + # Requires translation! +Great improvement = Academy = アカデミー Landmark = ランドマーク diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index c48f8ef1..9b6c8fa6 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -2938,6 +2938,8 @@ Remove Railroad = 철도 제거 Cancel improvement order = 시설 건설 취소 + # Requires translation! +Great improvement = Academy = 아카데미 Landmark = 랜드마크 diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index d265f4dd..9940a792 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -4731,6 +4731,8 @@ Remove Railroad = # Requires translation! Cancel improvement order = + # Requires translation! +Great improvement = # Requires translation! Academy = diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 35baa429..3475eb50 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -5300,6 +5300,8 @@ Remove Railroad = # Requires translation! Cancel improvement order = + # Requires translation! +Great improvement = # Requires translation! Academy = diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index ca52284b..2f746d92 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -3017,6 +3017,8 @@ Remove Railroad = Usuń kolej Cancel improvement order = Anuluj porządek udoskonaleń + # Requires translation! +Great improvement = Academy = Akademia Landmark = Słynne miejsce diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index c9fe165b..8edf3bc4 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -4249,6 +4249,8 @@ Remove Railroad = Remover ferrovia Cancel improvement order = Cancelar ordem de melhoria + # Requires translation! +Great improvement = Academy = Academia Landmark = Monumento diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index d4173fce..3da5c33c 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -4331,6 +4331,8 @@ Remove Railroad = # Requires translation! Cancel improvement order = + # Requires translation! +Great improvement = Academy = Academie Landmark = Reper diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index d6c2d8c7..41f267a8 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -2938,6 +2938,8 @@ Remove Railroad = Убрать железную дорогу Cancel improvement order = Отменить последнее задание + # Requires translation! +Great improvement = Academy = Академия Landmark = Достопримечательность diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index e725dac7..ae259a59 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -3261,6 +3261,8 @@ Remove Railroad = 拆除铁路 Cancel improvement order = 取消改善令 + # Requires translation! +Great improvement = Academy = 学院 Landmark = 风景地标 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 8fc62995..94fe0db7 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -2938,6 +2938,8 @@ Remove Railroad = Quitar ferrocarril Cancel improvement order = Cancelar orden de mejora + # Requires translation! +Great improvement = Academy = Academia Landmark = Edificio emblemático diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index a3a8964e..093547d1 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -3992,6 +3992,8 @@ Remove Railroad = 拆除鐵路 Cancel improvement order = 取消改良命令 + # Requires translation! +Great improvement = Academy = 學院 Landmark = 風景地標 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 58771d91..f6043db4 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -3564,6 +3564,8 @@ Remove Railroad = Demiryolunu ortadan kaldır Cancel improvement order = Geliştirme isteğini iptal et + # Requires translation! +Great improvement = Academy = Akademi Landmark = Sınır işareti diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index c0467e0a..34a7f792 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -2938,6 +2938,8 @@ Remove Railroad = Прибрати колію Cancel improvement order = Скасувати будівництво покращення + # Requires translation! +Great improvement = Academy = Академія Landmark = Визначна пам’ятка diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 69f0f78e..ff425e29 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -1,21 +1,21 @@ Brazilian_Portuguese = 65 Traditional_Chinese = 62 -Italian = 100 +Italian = 99 Polish = 96 -Russian = 100 +Russian = 99 Lithuanian = 26 Romanian = 46 -Korean = 100 +Korean = 99 Simplified_Chinese = 88 German = 98 Japanese = 99 Turkish = 75 English = 1 -Ukrainian = 100 +Ukrainian = 99 French = 98 Portuguese = 53 Indonesian = 99 Czech = 62 -Spanish = 100 +Spanish = 99 Malay = 6 Dutch = 14 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index caa8fad5..596f83d1 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 = 439 - const val appVersion = "3.9.3-patch1" + const val appCodeNumber = 440 + const val appVersion = "3.9.4" const val gdxVersion = "1.9.10" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 65f17c19..cc2f4125 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,15 @@ +## 3.9.4 + +Opening the New Game screen from within a game saves the previous game parameters, map generation parameters work again + +Resolved #2662 - left side of the screen no longer becomes unresponsive to player input after changing from a selected unit to a selected city + +Resolved #2735 - Diplomatic "Friends with friend/enemy" modifiers are recalculated every turn + +Great improvements are marked as such in the Civilopedia + +Translation updates + ## 3.9.3 Resolved #2723 - resource-specific improvement bonuses are *in addition to* the regular improvement bonuses, and not instead.