3.9.0

android/assets/jsons/translations/Brazilian_Portuguese.properties

@@ -3544,6 +3544,8 @@ Philosophy = Filosofia
 Currency = Moeda
 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Melhor é pão com coração feliz do que riqueza com tormento.' - Amenemope
 Engineering = Engenharia
+ # Requires translation!
+Roads connect tiles across rivers = 
 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'Ciência mecânica ou instrumental é a mais nobre e, acima de todas, a mais útil.' - Leonardo da Vinci
 Iron Working = Trabalho com ferro
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Não espere o aço ficar quente para bater, mas faça-o quente batendo.' - William Butler Yeats

android/assets/jsons/translations/Czech.properties

@@ -3714,6 +3714,8 @@ Philosophy = Filozofie
 Currency = Platidlo
 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Je lepší jíst se šťastným srdce, než se soužit v bohatství.' - Amenemope
 Engineering = Inženýrství
+ # Requires translation!
+Roads connect tiles across rivers = 
 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'Instrumentální nebo mechanická věda je ze všech nejušlechtileší a především nejužitešnější.' - Leonardo da Vinci
 Iron Working = Zpracování železa
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Nečekejte s útokem, dokud se nerozžhaví železo, ale rozžhavte ho údery.' - William Butler Yeats

android/assets/jsons/translations/Dutch.properties

@@ -4739,6 +4739,8 @@ Currency = Geld
 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 
 Engineering = Ingenieurswezen
  # Requires translation!
+Roads connect tiles across rivers = 
+ # Requires translation!
 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 
 Iron Working = Ijzer Bewerking
  # Requires translation!

android/assets/jsons/translations/English.properties

@@ -5012,6 +5012,8 @@ Currency =
  # Requires translation!
 Engineering = 
  # Requires translation!
+Roads connect tiles across rivers = 
+ # Requires translation!
 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 
  # Requires translation!
 Iron Working = 

android/assets/jsons/translations/French.properties

@@ -2673,6 +2673,8 @@ Philosophy = Philosophie
 Currency = Monnaie
 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Mieux vaut du pain avec un cœur heureux, que des richesses avec des tracas.' - Aménémopé
 Engineering = Ingénierie
+ # Requires translation!
+Roads connect tiles across rivers = 
 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'La science des instruments et de la mécanique est la plus noble et, par dessus tout, la plus utile.' - Léonard de Vinci
 Iron Working = Travail du fer
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'N'attendez pas que le fer soit chaud pour le frapper, mais frapper le pour qu'il soit chaud.' - William Butler Yeats

android/assets/jsons/translations/German.properties

@@ -2669,6 +2669,8 @@ Philosophy = Philosophie
 Currency = Währung
 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Besser ist Brot mit einem glücklichen Herzen als Reichtum mit Verdruss.' - Amenemope
 Engineering = Ingenieurwesen
+ # Requires translation!
+Roads connect tiles across rivers = 
 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'Die instrumentelle oder mechanische Wissenschaft ist die edelste und vor allem die nützlichste.' - Leonardo da Vinci
 Iron Working = Eisenbearbeitung
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Warten nicht, bis das Bügeleisen heiß ist, sondern mach es durch Schläge heiß.' - William Butler Yeats

android/assets/jsons/translations/Indonesian.properties

@@ -254,7 +254,6 @@ Could not load game from clipboard! = Tidak bisa memuat game dari papan klip!
 Start game! = Mulai permainan!
 Map Options = Opsi peta
 Game Options = Opsi permainan
- # Requires translation!
 Civilizations = Peradaban
 Map Type = Tipe peta
 Generated = Digenerasi Game
@@ -265,7 +264,6 @@ Default = Default
 Pangaea = Pangaea
 Perlin = Perlin
 Continents = Kontinen
- # Requires translation!
 Archipelago = Kepulauan
 Number of City-States = Banyaknya negara kota
 One City Challenge = Tantangan satu kota saja
@@ -617,7 +615,6 @@ Points per turn = Poin per giliran
 Convert production to gold at a rate of 4 to 1 = Konversi produksi ke emas dalam perbandingan 4 banding 1
 Convert production to science at a rate of [rate] to 1 = Konversi produksi ke ilmu pengetahuan dalam perbandingan [rate] banding 1
 The city will not produce anything. = Kota ini tidak akan memproduksi apapun.
- # Requires translation!
 Worked by [cityName] = Dikerjakan oleh [cityName]
 
 # Technology UI
@@ -2668,6 +2665,8 @@ 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 = 
 '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
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Jangan menunggu untuk menempa hingga besinya panas, tetapi buatlah dia panas dengan menempanya.' - William Butler Yeats

android/assets/jsons/translations/Italian.properties

@@ -2665,6 +2665,8 @@ Philosophy = Filosofia
 Currency = Valuta
 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Meglio il pane con un cuore felice, che la ricchezza con l'afflizione.' - Amenemope
 Engineering = Ingegneria
+ # Requires translation!
+Roads connect tiles across rivers = 
 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'La scienza degli strumenti e della meccanica è la più nobile di tutte, e soprattutto la più utile.' - Leonardo da Vinci
 Iron Working = Lavorazione del ferro
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Non aspettate che il ferro sia caldo prima di batterlo; rendetelo caldo con i vostri colpi.' - William Butler Yeats

android/assets/jsons/translations/Korean.properties

@@ -169,7 +169,6 @@ Strategic resources = 전략 자원
 [resourceName] not required = [resourceName] 자원이 불필요함
 Lost ability = 없어진 특성
 National ability = 문명 특성
- # It doesn't need to be translated, but for 100% translation.
 [firstValue] vs [secondValue] = [firstValue] vs [secondValue] 
 
 # Nations
@@ -2668,6 +2667,8 @@ Philosophy = 철학
 Currency = 화폐
 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = '마음이 행복할 때의 빵 한 조각이 불행할 때의 부보다 낫다.' - 아메네모페
 Engineering = 공학
+ # Requires translation!
+Roads connect tiles across rivers = 
 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = '계기학과 기계학이야말로, 그 무엇보다 고상하고 유용한 과학이다.' - 레오나르도 다 빈치
 Iron Working = 철제 기술
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = '철이 달았을 때까지 기다렸다 치지 마라. 쳐서 달구라.' - 윌리엄 버틀러 예이츠
@@ -3481,4 +3482,3 @@ Certain bonuses are given when you are at above 30 influence.\nWhen you have abo
 
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. =  후지 산, 지브롤터 암벽, 대보초 등의 '자연 경관'은 어느 지형들과도 다른 독특한 특성을 지닙니다.\n자연 경관은 맵에 하나씩밖에 없고, 유닛이 지나갈 수 없으며\n  도시에서 자연 경관에 생산을 할당하면 많은 양의 문화, 과학, 금, 생산력 등을 얻을 수 있습니다.\n따라서 자연 경관을 최대한 빨리 확보하는 것이 중요하다고 할 수 있습니다.
 
-

android/assets/jsons/translations/Malay.properties

@@ -4888,6 +4888,8 @@ Currency = Mata Wang
 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 
 Engineering = Kejuruteraan
  # Requires translation!
+Roads connect tiles across rivers = 
+ # Requires translation!
 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 
 Iron Working = Pekerja Besi
  # Requires translation!

android/assets/jsons/translations/Polish.properties

@@ -2719,6 +2719,8 @@ Philosophy = Filozofia
 Currency = Waluta
 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Rozradowanemu sercu lepszy chleb, niż bogactwo w utrapieniu.' – Amenemope
 Engineering = Inżynieria
+ # Requires translation!
+Roads connect tiles across rivers = 
 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'Nauka instrumentalna, zwana też mechaniczną, to najszlachetniejsza z dziedzin, a przede wszystkim najbardziej użyteczna.' – Leonardo da Vinci
 Iron Working = Obróbka żelaza
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Nie czekaj z kuciem, aż żelazo będzie gorące; uderzaj, by je rozgrzać.' – William Butler Yeats

android/assets/jsons/translations/Portuguese.properties

@@ -3899,6 +3899,8 @@ Philosophy = Filosofia
 Currency = Moeda
 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Melhor é pão com coração feliz do que riqueza com tormento.' - Amenemope
 Engineering = Engenharia
+ # Requires translation!
+Roads connect tiles across rivers = 
 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'Ciência mecânica ou instrumental é a mais nobre e, acima de todas, a mais útil.' - Leonardo da Vinci
 Iron Working = Trabalho com ferro
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Não espere o aço ficar quente para bater, mas faça-o quente batendo.' - William Butler Yeats

android/assets/jsons/translations/Romanian.properties

@@ -3968,6 +3968,8 @@ Currency = Monedă
 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Mai bine să ai pâine cu inimă fericită decât bogăție cu vexare' - Amenemope
 Engineering = Inginerie
  # Requires translation!
+Roads connect tiles across rivers = 
+ # Requires translation!
 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 
 Iron Working = Prelucrarea fierului
  # Requires translation!

android/assets/jsons/translations/Russian.properties

@@ -254,7 +254,6 @@ Could not load game from clipboard! = Не удалось загрузить и
 Start game! = Начать игру!
 Map Options = Настройка карты
 Game Options = Настройка игры
- # Requires translation!
 Civilizations = Цивилизации
 Map Type = Тип карты
 Generated = Сгенерированная
@@ -616,7 +615,6 @@ Points per turn = Очков за ход
 Convert production to gold at a rate of 4 to 1 = Обмен производства на золото 4 к 1
 Convert production to science at a rate of [rate] to 1 = Обмен производства на науку [rate] к 1
 The city will not produce anything. = Город ничего не будет производить.
- # Requires translation!
 Worked by [cityName] = Обрабатывается в г. [cityName]
 
 # Technology UI
@@ -1113,7 +1111,7 @@ Taj Mahal = Тадж-Махал
 
 'Things always seem fairer when we look back at them, and it is out of that inaccessible tower of the past that Longing leans and beckons.'  - James Russell Lowell = 'Многое начинает казаться лучше, когда остается в прошлом - и из этой неприступной башни Прошлого нас зовет и манит рукою Тоска.' - Джеймс Расселл Лоуэлл
 Free great scientist appears = Появляется бесплатный Великий Ученый
-Science gained from research agreements +50% = Договор об исследовании приносит на 50% больше науки
+Science gained from research agreements +50% = +50% к науке от договора об исследовании
 Porcelain Tower = Фарфоровая башня
 
 Must not be on hill = Город должен быть на холме
@@ -1175,7 +1173,7 @@ Solar Plant = Солнечные электростанции
 Sydney Opera House = Сиднейский Оперный театр
 
 'In preparing for battle I have always found that plans are useless, but planning is indispensable.'  - Dwight D. Eisenhower = 'При подготовке к битве планы незаменимы, но, как только битва началась, план становится совершенно бесполезным.' - Дуайт Эйзенхауэр
-Gold cost of upgrading military units reduced by 33% = Стоимость улучшения юнита снижается на 33%
+Gold cost of upgrading military units reduced by 33% = -33% к стоимости улучшения юнита
 Pentagon = Пентагон
 
 Increases production of spaceship parts by 50% = Ускоряет производство частей космического корабля на 50%
@@ -2667,6 +2665,8 @@ Philosophy = Философия
 Currency = Деньги
 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Лучше хлеб, который съедается с радостным сердцем, чем богатство с заботами.' - Аменемоп
 Engineering = Инженерное дело
+ # Requires translation!
+Roads connect tiles across rivers = 
 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'Механика — самая благородная и, главное, самая полезная из наук.' - Леонардо да Винчи
 Iron Working = Обработка железа
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Не жди, пока железо станет горячим для ковки - но куй, и оно станет горячим.' - Уильям Батлер Йейтс

android/assets/jsons/translations/Simplified_Chinese.properties

@@ -2965,6 +2965,8 @@ Philosophy = 哲学
 Currency = 货币制度
 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = “快乐的温饱胜过烦恼的富裕。”——阿蒙尼莫普（古埃及学者）
 Engineering = 工程学
+ # Requires translation!
+Roads connect tiles across rivers = 
 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = “研究工具或机械的学问是最崇高的，也是所有学问当中最有用的。”——列奥纳多·达·芬奇
 Iron Working = 铁器
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = “不要等铁变热才对其锻打；而要通过锻打而使其变热。”——威廉·巴特勒·叶芝

android/assets/jsons/translations/Spanish.properties

@@ -3258,6 +3258,8 @@ Philosophy = Filosofía
 Currency = Moneda
 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Mejor es el pan con un corazón feliz que riquesas con vejación" - Amenemope
 Engineering = Ingeniería
+ # Requires translation!
+Roads connect tiles across rivers = 
 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'La ciencia mecánica o instrumental es la mas noble, y por sobre todas las demas, la mas útil.' - Leonardo da Vinci
 Iron Working = Trabajo del hierro
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'No esperes a golpear el hierro cuando este caliente, si no que hazlo caliente por golpearlo.' - William Butler Yeats

android/assets/jsons/translations/Traditional_Chinese.properties

@@ -3694,6 +3694,8 @@ Philosophy = 哲學
 Currency = 貨幣制度
 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = “快樂的溫飽勝過煩惱的富裕。”——阿蒙尼莫普（古埃及學者）
 Engineering = 工程學
+ # Requires translation!
+Roads connect tiles across rivers = 
 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = “研究工具或機械的學問是最崇高的，也是所有學問當中最有用的。”——列奧納多·達·芬奇
 Iron Working = 鐵器
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = “不要等鐵變熱才對其鍛打；而要通過鍛打而使其變熱。”——威廉·巴特勒·葉芝

android/assets/jsons/translations/Turkish.properties

@@ -3266,6 +3266,8 @@ Philosophy = Felsefe
 Currency = Para Birimi
 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Mutlu kalpli ekmek, sıkıntılı servetten daha iyidir.' - Amenemope
 Engineering = Mühendislik
+ # Requires translation!
+Roads connect tiles across rivers = 
 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'Enstrümantal veya mekanik bilim en asil ve hepsinden önemlisi en faydalı olanıdır.' - Leonardo da Vinci
 Iron Working = Demir İşleme
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Demir sıcak olana kadar vurmayı beklemeyin, ancak vurarak ısınmasını sağlayın.' - William Butler Yeats

android/assets/jsons/translations/Ukrainian.properties

@@ -2667,6 +2667,8 @@ Philosophy = Філософія
 Currency = Гроші
 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = «Краще шмат хліба зі щастям, ніж багатство з клопотами.» — Аменемопет. Настанови
 Engineering = Інженерія
+ # Requires translation!
+Roads connect tiles across rivers = 
 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = «Інструментальна чи механічна наука — це найблагородніша і, найкорисніша за всі інші.» — Леонардо да Вінчі
 Iron Working = Виплавка металів
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = «Не чекайте з ударами, до розігріву криці, тому зробіть її гарячою ударами.» — Вільям Батлер Єтс

android/assets/jsons/translations/completionPercentages.properties

@@ -1,4 +1,4 @@
-Brazilian_Portuguese = 66
+Brazilian_Portuguese = 65
 Traditional_Chinese = 63
 Italian = 99
 Polish = 97
@@ -7,7 +7,7 @@ Romanian = 47
 Korean = 99
 Simplified_Chinese = 89
 German = 99
-Japanese = 60
+Japanese = 80
 Turkish = 76
 English = 1
 Ukrainian = 99

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 = 432
-    const val appVersion = "3.8.12-patch1"
+    const val appCodeNumber = 433
+    const val appVersion = "3.9.0"
 
     const val gdxVersion = "1.9.10"
     const val roboVMVersion = "2.3.1"

changelog.md

@@ -1,3 +1,17 @@
+## 3.9.0
+
+Added rivers, and river generation!
+
+Game now saves save files in external storage on Android when possible.
+
+Resolved #2672 - Difficulties are sorted by ascending difficulty in Civilopedia
+
+Resolved #2660 - Remove Fallout now enabled by Atomic Theory, not Agriculture
+
+Great person uniques can be added to any modded unit
+
+Translation updates
+
 ## 3.8.12
 
 By dbaelz:

core/src/com/unciv/logic/civilization/CivilizationInfo.kt

@@ -272,6 +272,8 @@ class CivilizationInfo {
             && (citiesCreated > 0 || !getCivUnits().any { it.name == Constants.settler })
 
     fun getEra(): String {
+        if(tech.researchedTechnologies.isEmpty())
+            return gameInfo.ruleSet.getEras().first()
         val maxEraOfTech =  tech.researchedTechnologies
                 .asSequence()
                 .map { it.column!! }