diff --git a/project/java/DataDownloader.java b/project/java/DataDownloader.java
index 4d2e0f36c..cc356d503 100644
--- a/project/java/DataDownloader.java
+++ b/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()) + "'");
diff --git a/project/java/translations/values-de/strings.xml b/project/java/translations/values-de/strings.xml
index 686956cd3..60c966f2d 100644
--- a/project/java/translations/values-de/strings.xml
+++ b/project/java/translations/values-de/strings.xml
@@ -101,4 +101,8 @@
Zwei-Finger-Gesten
Sehr schnell
Zwei-Finger-Gesten Bildschirm Empfindlichkeit
+Geben Sie direkt
+Geben Kommandozeilenparameter
+Kalibrieren Touchscreen
+Touch allen vier Rändern des Bildschirms, wenn Sie fertig sind, drücken Sie Zurück
diff --git a/project/java/translations/values-fi/strings.xml b/project/java/translations/values-fi/strings.xml
index 5969addd5..5443781e4 100644
--- a/project/java/translations/values-fi/strings.xml
+++ b/project/java/translations/values-fi/strings.xml
@@ -101,4 +101,8 @@
Kahden sormen eleitä
Erittäin nopea
Kahden sormen näytön eleet herkkyys
+Määritä hakemisto
+Määritä komentoriviparametrit
+Kalibroi kosketusnäyttö
+Touch kaikki neljä reunaa näytön, paina Takaisin, kun olet valmis
diff --git a/project/java/translations/values-fr/strings.xml b/project/java/translations/values-fr/strings.xml
index 101f7175c..9e1930dac 100644
--- a/project/java/translations/values-fr/strings.xml
+++ b/project/java/translations/values-fr/strings.xml
@@ -104,4 +104,8 @@
Deux doigts gestes
Très rapide
Deux doigts écran gestes sensibilité
+Spécifiez le répertoire
+Spécifier les paramètres de ligne de commande
+Calibrer écran tactile
+Touchez les quatre bords de l\u0026#39;écran, appuyez sur Retour lorsque vous avez terminé
diff --git a/project/java/translations/values-ru/strings.xml b/project/java/translations/values-ru/strings.xml
index e9c08802e..d227a93a0 100644
--- a/project/java/translations/values-ru/strings.xml
+++ b/project/java/translations/values-ru/strings.xml
@@ -94,4 +94,8 @@
Жест двумя пальцами по экрану
Очень быстро
Чувствительность жеста двумя пальцами по экрану
+Укажите каталог
+Укажите параметры командной строки
+Калибровка сенсорного экрана
+Дотроньтесь до всех четырех краев экрана, потом нажмите Назад
diff --git a/project/java/translations/values-uk/strings.xml b/project/java/translations/values-uk/strings.xml
index b3b239c4d..ad164d362 100644
--- a/project/java/translations/values-uk/strings.xml
+++ b/project/java/translations/values-uk/strings.xml
@@ -94,4 +94,8 @@
Жест двома пальцями по екрану
Дуже швидко
Чутливість жесту двома пальцями по екрану
+Вкажіть каталог
+Вкажіть параметри командного рядка
+Калібрування сенсорного екрану
+Доторкнiться до всіх чотирьох країв екрану, потiм натисніть Назад
diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg
index ce0c84363..7c2acd733 100644
--- a/project/jni/application/fheroes2/AndroidAppSettings.cfg
+++ b/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
-AppVersionName="2149.08"
+AppVersionCode=214909
+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'
diff --git a/project/jni/application/src b/project/jni/application/src
index 104f796a6..59d41f41e 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-ballfield
\ No newline at end of file
+fheroes2
\ No newline at end of file