From 7ee76771f5a132c5d925d2e37919e921afb49aff Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 10 Dec 2018 14:09:01 +0200
Subject: [PATCH] Added some missing translations aab/apk now doesn't einclude
 local debug files Maybe solved resume problem on Chrome OS (see issue 322),
 needs to be checked

---
 android/assets/jsons/Translations.json | 11 +++++++++++
 android/build.gradle                   | 12 ++++++++++++
 core/src/com/unciv/UnCivGame.kt        |  5 +++++
 3 files changed, 28 insertions(+)

diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json
index 061b917f30..18a403487c 100644
--- a/android/assets/jsons/Translations.json
+++ b/android/assets/jsons/Translations.json
@@ -144,6 +144,8 @@
 		Simplified_Chinese:"自动工作"
 		Portuguese:"Automatizar"
 	}
+	
+	"Stop automation":{}
 
 	"Fortify":{
 		Italian:"Fortifica"
@@ -2715,6 +2717,8 @@
         Portuguese:"Quem sabe o que o futuro reserva?"
 	}
 	
+	// Tech uniques
+	
 	"Improves movement speed on roads":{
 		Italian:"Migliora la velocità sulle strade"
 		Russian:"Ускоряет скорость передвижения по дорогам"
@@ -2758,6 +2762,12 @@
         Simplified_Chinese:"使城市生产转化为金钱"
         Portuguese:"Habilita a conversão da produção das cidades para ouro"
 	}
+	
+	"Enables embarkation for land units":{}
+	
+	
+	"Enables embarked units to enter ocean tiles":{}
+	
 	"Increases embarked movement +1":{
 		Italian:"+1 movimento delle unità imbarcate"
 		French:"Améliore le déplacement en embarcation +1"
@@ -4011,6 +4021,7 @@
         Simplified_Chinese:"只能建在沿海城市"
         Portuguese:"Só pode ser construido em cidades costeiras"
 	}
+	"+1 food from Ocean and Coast tiles":{}
 	
 	"The Great Lighthouse":{
 		Italian:"Grande Faro"
diff --git a/android/build.gradle b/android/build.gradle
index 180ff6d837..63b70432ad 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -39,9 +39,21 @@ android {
 
     buildTypes {
         release {
+            // Don't add local save files and fonts to release, obviously
+            aaptOptions {
+                ignoreAssetsPattern "!SaveFiles:!fonts"
+            }
+        
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
+        debug {
+            // Don't add local save files and fonts to release, obviously
+            aaptOptions {
+                ignoreAssetsPattern "!SaveFiles:!fonts"
+            }
+        }
     }
 }
 
diff --git a/core/src/com/unciv/UnCivGame.kt b/core/src/com/unciv/UnCivGame.kt
index c268383099..5835061029 100644
--- a/core/src/com/unciv/UnCivGame.kt
+++ b/core/src/com/unciv/UnCivGame.kt
@@ -82,6 +82,11 @@ class UnCivGame : Game() {
         setWorldScreen()
     }
 
+    // Maybe this will solve the resume error on chrome OS, issue 322? Worth a shot
+    override fun resize(width: Int, height: Int) {
+        resume()
+    }
+
     companion object {
         lateinit var Current: UnCivGame
     }