Even more debug

project/java/DataDownloader.java

@@ -283,14 +283,20 @@ class DataDownloader extends Thread
 		{
 			System.out.println("Unpacking from assets: '" + url + "'");
 			try {
+				System.out.println("Unpacking from assets: '" + url + "' 1");
 				stream = new CountingInputStream(Parent.getAssets().open(url));
+				System.out.println("Unpacking from assets: '" + url + "' 2");
 				while( stream.skip(65536) > 0 ) { };
+				System.out.println("Unpacking from assets: '" + url + "' 3");
 				totalLen = stream.getBytesRead();
+				System.out.println("Unpacking from assets: '" + url + "' 4 totalLen = " + String.valueOf(totalLen));
 				stream.close();
+				System.out.println("Unpacking from assets: '" + url + "' 5");
 				stream = new CountingInputStream(Parent.getAssets().open(url));
+				System.out.println("Unpacking from assets: '" + url + "' 6");
 			} catch( IOException e ) {
-				Status.setText( res.getString(R.string.error_dl_from, url) );
 				System.out.println("Unpacking from assets '" + url + "' - error: " + e.toString());
+				Status.setText( res.getString(R.string.error_dl_from, url) );
 				return false;
 			}
 		}
@@ -362,6 +368,7 @@ class DataDownloader extends Thread
 		}
 		else
 		{
+			System.out.println("Reading from zip file '" + url + "'");
 			ZipInputStream zip = new ZipInputStream(stream);
 			
 			while(true)
@@ -369,12 +376,17 @@ class DataDownloader extends Thread
 				ZipEntry entry = null;
 				try {
 					entry = zip.getNextEntry();
+					System.out.println("Reading from zip file '" + url + "' entry '" + entry.getName() + "'");
 				} catch( java.io.IOException e ) {
 					Status.setText( res.getString(R.string.error_dl_from, url) );
+					System.out.println("Error reading from zip file '" + url + "': " + e.toString());
 					return false;
 				}
 				if( entry == null )
+				{
+					System.out.println("Reading from zip file '" + url + "' finished");
 					break;
+				}
 				if( entry.isDirectory() )
 				{
 					System.out.println("Creating dir '" + getOutFilePath(entry.getName()) + "'");

project/java/translations/values-de/strings.xml

@@ -101,4 +101,8 @@
 <string name="remap_screenkb_button_gestures">Zwei-Finger-Gesten</string>
 <string name="accel_veryfast">Sehr schnell</string>
 <string name="remap_screenkb_button_gestures_sensitivity">Zwei-Finger-Gesten Bildschirm Empfindlichkeit</string>
+<string name="storage_custom">Geben Sie direkt</string>
+<string name="storage_commandline">Geben Kommandozeilenparameter</string>
+<string name="calibrate_touchscreen">Kalibrieren Touchscreen</string>
+<string name="calibrate_touchscreen_touch">Touch allen vier Rändern des Bildschirms, wenn Sie fertig sind, drücken Sie Zurück</string>
 </resources>

project/java/translations/values-fi/strings.xml

@@ -101,4 +101,8 @@
 <string name="remap_screenkb_button_gestures">Kahden sormen eleitä</string>
 <string name="accel_veryfast">Erittäin nopea</string>
 <string name="remap_screenkb_button_gestures_sensitivity">Kahden sormen näytön eleet herkkyys</string>
+<string name="storage_custom">Määritä hakemisto</string>
+<string name="storage_commandline">Määritä komentoriviparametrit</string>
+<string name="calibrate_touchscreen">Kalibroi kosketusnäyttö</string>
+<string name="calibrate_touchscreen_touch">Touch kaikki neljä reunaa näytön, paina Takaisin, kun olet valmis</string>
 </resources>

project/java/translations/values-fr/strings.xml

@@ -104,4 +104,8 @@
 <string name="remap_screenkb_button_gestures">Deux doigts gestes</string>
 <string name="accel_veryfast">Très rapide</string>
 <string name="remap_screenkb_button_gestures_sensitivity">Deux doigts écran gestes sensibilité</string>
+<string name="storage_custom">Spécifiez le répertoire</string>
+<string name="storage_commandline">Spécifier les paramètres de ligne de commande</string>
+<string name="calibrate_touchscreen">Calibrer écran tactile</string>
+<string name="calibrate_touchscreen_touch">Touchez les quatre bords de l\u0026#39;écran, appuyez sur Retour lorsque vous avez terminé</string>
 </resources>

project/java/translations/values-ru/strings.xml

@@ -94,4 +94,8 @@
 <string name="remap_screenkb_button_gestures">Жест двумя пальцами по экрану</string>
 <string name="accel_veryfast">Очень быстро</string>
 <string name="remap_screenkb_button_gestures_sensitivity">Чувствительность жеста двумя пальцами по экрану</string>
+<string name="storage_custom">Укажите каталог</string>
+<string name="storage_commandline">Укажите параметры командной строки</string>
+<string name="calibrate_touchscreen">Калибровка сенсорного экрана</string>
+<string name="calibrate_touchscreen_touch">Дотроньтесь до всех четырех краев экрана, потом нажмите Назад</string>
 </resources>

project/java/translations/values-uk/strings.xml

@@ -94,4 +94,8 @@
 <string name="remap_screenkb_button_gestures">Жест двома пальцями по екрану</string>
 <string name="accel_veryfast">Дуже швидко</string>
 <string name="remap_screenkb_button_gestures_sensitivity">Чутливість жесту двома пальцями по екрану</string>
+<string name="storage_custom">Вкажіть каталог</string>
+<string name="storage_commandline">Вкажіть параметри командного рядка</string>
+<string name="calibrate_touchscreen">Калібрування сенсорного екрану</string>
+<string name="calibrate_touchscreen_touch">Доторкнiться до всіх чотирьох країв екрану, потiм натисніть Назад</string>
 </resources>

project/jni/application/fheroes2/AndroidAppSettings.cfg

@@ -22,8 +22,8 @@ AppTouchscreenKeyboardKeysAmount=0
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="LCTRL M T H E C SPACE C S L"
 MultiABI=n
-AppVersionCode=214908
+AppVersionCode=214909
-AppVersionName="2149.08"
+AppVersionName="2149.09"
 CompiledLibraries="sdl_net sdl_mixer sdl_image sdl_ttf png intl"
 CustomBuildScript=n
 AppCflags='-finline-functions -O2 -DWITH_ZLIB -DWITH_MIXER -DWITH_XML -DWITH_IMAGE -DWITH_TTF'

project/jni/application/src

@@ -1 +1 @@
-ballfield
+fheroes2