From daa32139fe83d69e148f5df3715930913e7ee52e Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Wed, 21 Oct 2015 10:35:35 +0200
Subject: Make device information message more verbose.

---
 main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java | 7 ++++---
 main/src/main/res/layout/log_fragment.xml                | 1 -
 main/src/main/res/values-cs/strings.xml                  | 1 -
 main/src/main/res/values-de/strings.xml                  | 4 +++-
 main/src/main/res/values-es/strings.xml                  | 1 -
 main/src/main/res/values-et/strings.xml                  | 1 -
 main/src/main/res/values-fr/strings.xml                  | 1 -
 main/src/main/res/values-hu/strings.xml                  | 1 -
 main/src/main/res/values-in/strings.xml                  | 1 -
 main/src/main/res/values-it/strings.xml                  | 1 -
 main/src/main/res/values-ja/strings.xml                  | 1 -
 main/src/main/res/values-ko/strings.xml                  | 1 -
 main/src/main/res/values-pl/strings.xml                  | 1 -
 main/src/main/res/values-ro/strings.xml                  | 1 -
 main/src/main/res/values-ru/strings.xml                  | 1 -
 main/src/main/res/values-sl/strings.xml                  | 1 -
 main/src/main/res/values-sv/strings.xml                  | 1 -
 main/src/main/res/values-tr/strings.xml                  | 1 -
 main/src/main/res/values-uk/strings.xml                  | 1 -
 main/src/main/res/values-vi/strings.xml                  | 1 -
 main/src/main/res/values-zh-rCN/strings.xml              | 1 -
 main/src/main/res/values/strings.xml                     | 3 +--
 22 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java b/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
index aa9a5660..78deb7d3 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
@@ -287,11 +287,11 @@ public class VpnStatus {
                     NoSuchAlgorithmException ignored) {
             }
 
-            Object[] argsext = Arrays.copyOf(mArgs, mArgs.length + 2);
+            Object[] argsext = Arrays.copyOf(mArgs, mArgs.length);
             argsext[argsext.length - 1] = apksign;
             argsext[argsext.length - 2] = version;
 
-            return c.getString(R.string.mobile_info_extended, argsext);
+            return c.getString(R.string.mobile_info, argsext);
 
         }
 
@@ -338,7 +338,8 @@ public class VpnStatus {
     }
 
     private static void logInformation() {
-        logInfo(R.string.mobile_info, Build.MODEL, Build.BOARD, Build.BRAND, Build.VERSION.SDK_INT, NativeUtils.getNativeAPI());
+        logInfo(R.string.mobile_info, Build.MODEL, Build.BOARD, Build.BRAND, Build.VERSION.SDK_INT,
+                NativeUtils.getNativeAPI(), Build.VERSION.RELEASE, Build.ID, Build.FINGERPRINT, "", "");
     }
 
     public synchronized static void addLogListener(LogListener ll) {
diff --git a/main/src/main/res/layout/log_fragment.xml b/main/src/main/res/layout/log_fragment.xml
index ac70c01f..491882a9 100644
--- a/main/src/main/res/layout/log_fragment.xml
+++ b/main/src/main/res/layout/log_fragment.xml
@@ -30,7 +30,6 @@
 
     <ListView
             android:id="@android:id/list"
-            android:stackFromBottom="true"
             android:transcriptMode="normal"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"/>
diff --git a/main/src/main/res/values-cs/strings.xml b/main/src/main/res/values-cs/strings.xml
index f75c423e..231447fe 100755
--- a/main/src/main/res/values-cs/strings.xml
+++ b/main/src/main/res/values-cs/strings.xml
@@ -259,7 +259,6 @@
   <string name="encryption_cipher">Šifrovací algoritmus</string>
   <string name="packet_auth">Ověřování paketů</string>
   <string name="auth_dialog_title">Zadej způsob ověřování paketů</string>
-  <string name="mobile_info_extended">Běží na %1$s (%2$s) %3$s, Android API %4$d, verze %5$s, %6$s</string>
   <string name="built_by">sestaveno od %s</string>
   <string name="debug_build">ladící verze</string>
   <string name="official_build">oficiální verze</string>
diff --git a/main/src/main/res/values-de/strings.xml b/main/src/main/res/values-de/strings.xml
index 6c243e4f..989cd770 100755
--- a/main/src/main/res/values-de/strings.xml
+++ b/main/src/main/res/values-de/strings.xml
@@ -259,7 +259,6 @@
   <string name="encryption_cipher">Verschlüsselungsalgorithmus</string>
   <string name="packet_auth">Packetauthentifizierung</string>
   <string name="auth_dialog_title">Geben Sie den Authentifizierungsalgorithmus an</string>
-  <string name="mobile_info_extended">Modell %1$s (%2$s) %3$s, Android API %4$d, version %5$s, %6$s</string>
   <string name="built_by">compiliert von %s</string>
   <string name="debug_build">Testversion</string>
   <string name="official_build">offizielle Version</string>
@@ -358,6 +357,7 @@
   <string name="ab_proxy">Android wird ihre Proxy-Einstellungen für die WLan-Verbindung beibehalten wenn keine DNS-Servereinstellungen vorhanden sind. OpenVPN für Android gibt einen entsprechenden Warnhinweis in der Log-Datei aus.<p> Wenn eine VPN-Verbindung einen DNS-Server vorgibt kann kein Proxy genutzt werden. Es gibt keine API um einen Proxy-Server  für eine VPN-Verbindung zu nutzen.</p></string>
   <string name="ab_lollipop_reinstall">Ihre VPN-Anwendung funktioniert möglicherweise nicht mehr wenn diese erst de- und später neu installiert wird. Für Details siehe #80074</string>
   <string name="ab_not_route_to_vpn">Die konfigurierte Klient-IP-Adresse und die IP-Adressen in die Netzwerkmaske sind nicht in das VPN geroutet. OpenVPN umgeht diesen Fehler, indem eine Route hinzugefügt wird, die zu der Client-IP-Adresse und deren Netzmaske passt.</string>
+  <string name="ab_persist_tun">Beim Öffnen eines neuen VPN devices (tun) während eines bereits geöffnet ist (für persist-tun Unterstützung) führt zum Absturz des VPN Dienstes auf Android, der nur durch einen Neustart behoben werden kann. OpenVPN für Android versucht deshalb dieses erneute Öffnen zu vermeiden. Wenn ein erneutes Öffnen zwingend notwendig ist, wird erst das alte Device geschlossen before ein neues geöffnet wird. Dies kann dazu führen, dass teilweise Pakete unverschlüsselt über die normal Internetverbindung gesendet werden. Auch mit diesem Workaround stürzt teilweise der VPN Dienst ab und erfordert einen Neustart des Gerätes.</string>
   <string name="ab_secondary_users">VPN funktioniert überhaupt nicht für die Sekundärnutzer.</string>
   <string name="ab_kitkat_reconnect">Mehrere Benutzer berichten, dass die mobile Verbindung/Mobile Datenverbindung häufig getrennt wird, wenn ein VPN aktiv. Das Verhalten scheint nur einige Anbieter/Mobilgerät-Kombination beeinflussen und bisher konnte weder Ursache noch Lösung für den Bug identifiziert werden.</string>
   <string name="ab_vpn_reachability_44">Nur Ziele, die ohne VPN erreichbar sind, sind auch mit VPN erreichbar. IPv6 VPNs funktionieren überhaupt nicht.</string>
@@ -387,6 +387,8 @@
   <string name="clear_log_on_connect">Protokoll bei neuer Verbindung leeren</string>
   <string name="connect_timeout">Verbindungstimeout</string>
   <string name="no_allowed_app">Keine erlaubte App hinzgefügt. Füge die App selbst (%s) hinzu um wenigsten eine App in der Liste der nicht erlaubten Anwendungen zu haben</string>
+  <string name="query_permissions_sdcard">OpenVPN für Android kann versuchen, die fehlende(n) Datei(en) auf der SD-Karte automatisch zu finden. Tippen Sie auf diese Meldung um die Berechtigungsanfrage zu starten.</string>
   <string name="protocol">Protokoll</string>
   <string name="enabled_connection_entry">Aktiviert</string>
+  <string name="abi_mismatch">Bevorzugte native ABI Reihenfolge dieses Gerätes (%1$s) und die installierten nativen Bibliotheken (%2$s) unterscheiden sich</string>
 </resources>
diff --git a/main/src/main/res/values-es/strings.xml b/main/src/main/res/values-es/strings.xml
index 1465e4b8..8a9e0494 100755
--- a/main/src/main/res/values-es/strings.xml
+++ b/main/src/main/res/values-es/strings.xml
@@ -260,7 +260,6 @@ hacia/de Móvil)</string>
   <string name="encryption_cipher">Algoritmo de encriptación</string>
   <string name="packet_auth">Autenticación de paquetes</string>
   <string name="auth_dialog_title">Introduzca método de autenticación de paquetes</string>
-  <string name="mobile_info_extended">Corriendo sobre %1$s (%2$s) %3$s, API Android %4$d, versión %5$s, %6$s</string>
   <string name="built_by">compilado por %s</string>
   <string name="debug_build">versión de depuración</string>
   <string name="official_build">versión oficial</string>
diff --git a/main/src/main/res/values-et/strings.xml b/main/src/main/res/values-et/strings.xml
index fc4bd64f..301158c2 100755
--- a/main/src/main/res/values-et/strings.xml
+++ b/main/src/main/res/values-et/strings.xml
@@ -259,7 +259,6 @@
   <string name="encryption_cipher">Krüptošiffer</string>
   <string name="packet_auth">Pakettide autentimine</string>
   <string name="auth_dialog_title">Sisestage pakettide autentimismeetod</string>
-  <string name="mobile_info_extended">Töötab seadmel %1$s (%2$s) %3$s, Android API %4$d, versioon %5$s, %6$s</string>
   <string name="built_by">Kompileerija: %s</string>
   <string name="debug_build">Silumisversioon</string>
   <string name="official_build">Ametlik versioon</string>
diff --git a/main/src/main/res/values-fr/strings.xml b/main/src/main/res/values-fr/strings.xml
index b3d3ca75..d858a23e 100755
--- a/main/src/main/res/values-fr/strings.xml
+++ b/main/src/main/res/values-fr/strings.xml
@@ -260,7 +260,6 @@ Sur certaines images, cette notification joue un son.\nAndroid à introduit ces
   <string name="encryption_cipher">Chiffrement de cryptage</string>
   <string name="packet_auth">Authentification des paquets</string>
   <string name="auth_dialog_title">Méthode d\'authentification des paquets</string>
-  <string name="mobile_info_extended">Environnement: %1$s (%2$s) %3$s, Android API %4$d, version %5$s, %6$s</string>
   <string name="built_by">compilé par %s</string>
   <string name="debug_build">version de debug</string>
   <string name="official_build">version officielle</string>
diff --git a/main/src/main/res/values-hu/strings.xml b/main/src/main/res/values-hu/strings.xml
index 651652ad..72d3b0c4 100755
--- a/main/src/main/res/values-hu/strings.xml
+++ b/main/src/main/res/values-hu/strings.xml
@@ -250,7 +250,6 @@
   <string name="encryption_cipher">Titkosítás</string>
   <string name="packet_auth">Csomag hitelesítés</string>
   <string name="auth_dialog_title">Adja meg a csomaghitelesítési metódust</string>
-  <string name="mobile_info_extended">%1$s (%2$s) %3$s, Android API %4$d, %5$s, %6$s verzió</string>
   <string name="built_by">%s fordítóval</string>
   <string name="debug_build">hibakeresési fordítás</string>
   <string name="official_build">hivatalos build</string>
diff --git a/main/src/main/res/values-in/strings.xml b/main/src/main/res/values-in/strings.xml
index a37bc7bf..0a76e695 100755
--- a/main/src/main/res/values-in/strings.xml
+++ b/main/src/main/res/values-in/strings.xml
@@ -259,7 +259,6 @@
   <string name="encryption_cipher">Enkripsi sandi</string>
   <string name="packet_auth">Otentikasi paket</string>
   <string name="auth_dialog_title">Masukkan metode otentikasi paket</string>
-  <string name="mobile_info_extended">Berjalan pada Android API %4$d, versi %5$s %1$s (%2$s) %3$s, %6$s</string>
   <string name="built_by">dibangun oleh %s</string>
   <string name="debug_build">Pengembangan debug</string>
   <string name="official_build">Build Resmi</string>
diff --git a/main/src/main/res/values-it/strings.xml b/main/src/main/res/values-it/strings.xml
index f71c645f..4e1f36de 100755
--- a/main/src/main/res/values-it/strings.xml
+++ b/main/src/main/res/values-it/strings.xml
@@ -261,7 +261,6 @@ Effettuata la lettura del file di configurazione</string>
   <string name="encryption_cipher">Algoritmo di crittografia</string>
   <string name="packet_auth">Autenticazione pacchetti</string>
   <string name="auth_dialog_title">Seleziona il metodo di autenticazione dei pacchetti</string>
-  <string name="mobile_info_extended">In esecuzione su %1$s (%2$s) %3$s, Android API %4$d, versione %5$s, %6$s</string>
   <string name="built_by">compilato da %s</string>
   <string name="debug_build">versione di debug</string>
   <string name="official_build">versione ufficiale</string>
diff --git a/main/src/main/res/values-ja/strings.xml b/main/src/main/res/values-ja/strings.xml
index 1ff3e75f..b9490153 100755
--- a/main/src/main/res/values-ja/strings.xml
+++ b/main/src/main/res/values-ja/strings.xml
@@ -270,7 +270,6 @@ OpenVPNの接続を保証するためには、アプリケーションを高い
   <string name="encryption_cipher">暗号化方式</string>
   <string name="packet_auth">パケット認証</string>
   <string name="auth_dialog_title">パケット認証方式を入力してください。</string>
-  <string name="mobile_info_extended">%1$s (%2$s) %3$s、Android API %4$d、バージョン %5$s %6$s において実行中</string>
   <string name="built_by">%s によりビルド</string>
   <string name="debug_build">デバッグ ビルド</string>
   <string name="official_build">正式ビルド</string>
diff --git a/main/src/main/res/values-ko/strings.xml b/main/src/main/res/values-ko/strings.xml
index 8f0a8dc3..3df4a807 100755
--- a/main/src/main/res/values-ko/strings.xml
+++ b/main/src/main/res/values-ko/strings.xml
@@ -257,7 +257,6 @@
   <string name="encryption_cipher">암호화 암호</string>
   <string name="packet_auth">패킷 인증</string>
   <string name="auth_dialog_title">패킷 인증 방법을 입력한다</string>
-  <string name="mobile_info_extended">%1$s (%2$s) %3$s, 안드로이드 API %4$d, 버전 %5$s, %6$s에서 실행</string>
   <string name="built_by">개발자 %s</string>
   <string name="debug_build">디버그 빌드</string>
   <string name="official_build">공식 빌드</string>
diff --git a/main/src/main/res/values-pl/strings.xml b/main/src/main/res/values-pl/strings.xml
index 89e5900f..0832ad62 100755
--- a/main/src/main/res/values-pl/strings.xml
+++ b/main/src/main/res/values-pl/strings.xml
@@ -252,7 +252,6 @@
   <string name="encryption_cipher">Szyfr kodujący</string>
   <string name="packet_auth">Pakiety uwierzytelniania</string>
   <string name="auth_dialog_title">Wpisz metodę uwierzytelniania pakietów</string>
-  <string name="mobile_info_extended">Działa na %1$s (%2$s) %3$s, Android API %4$d, wersja %5$s, %6$s</string>
   <string name="built_by">zbudowany przez %s</string>
   <string name="debug_build">Kompilacja z debugiem</string>
   <string name="official_build">Oficjalna kompilacja</string>
diff --git a/main/src/main/res/values-ro/strings.xml b/main/src/main/res/values-ro/strings.xml
index 91b9abb1..f208700c 100755
--- a/main/src/main/res/values-ro/strings.xml
+++ b/main/src/main/res/values-ro/strings.xml
@@ -251,7 +251,6 @@
   <string name="encryption_cipher">Cifru criptare</string>
   <string name="packet_auth">Autentificare pachete</string>
   <string name="auth_dialog_title">Introduceţi metoda de autentificare de pachete</string>
-  <string name="mobile_info_extended">Rulează pe %1$s (%2$s) %3$s, Android API %4$d, versiunea %5$s, %6$s</string>
   <string name="built_by">compilat de %s</string>
   <string name="debug_build">versiune debug</string>
   <string name="official_build">versiune oficială</string>
diff --git a/main/src/main/res/values-ru/strings.xml b/main/src/main/res/values-ru/strings.xml
index 8a9e3b63..2aed9a9b 100755
--- a/main/src/main/res/values-ru/strings.xml
+++ b/main/src/main/res/values-ru/strings.xml
@@ -259,7 +259,6 @@
   <string name="encryption_cipher">Алгоритм шифрования</string>
   <string name="packet_auth">Проверка подлинности пакетов</string>
   <string name="auth_dialog_title">Укажите метод проверки подлинности пакетов</string>
-  <string name="mobile_info_extended">Запущен на %1$s (%2$s) %3$s, Android API %4$d, версии %5$s, %6$s</string>
   <string name="built_by">создан %s</string>
   <string name="debug_build">сборка для отладки</string>
   <string name="official_build">официальная сборка</string>
diff --git a/main/src/main/res/values-sl/strings.xml b/main/src/main/res/values-sl/strings.xml
index c46265cc..5972a661 100755
--- a/main/src/main/res/values-sl/strings.xml
+++ b/main/src/main/res/values-sl/strings.xml
@@ -259,7 +259,6 @@
   <string name="encryption_cipher">Šifra</string>
   <string name="packet_auth">Overitev paketov</string>
   <string name="auth_dialog_title">Vnesite način overitve paketov</string>
-  <string name="mobile_info_extended">Se izvaja na %1$s (%2$s) %3$s, API Android %4$d, različice %5$s, %6$s</string>
   <string name="built_by">izgradil %s</string>
   <string name="debug_build">razhroščevalna izgradnja</string>
   <string name="official_build">uradna izgradnja</string>
diff --git a/main/src/main/res/values-sv/strings.xml b/main/src/main/res/values-sv/strings.xml
index 2043499f..1325512c 100755
--- a/main/src/main/res/values-sv/strings.xml
+++ b/main/src/main/res/values-sv/strings.xml
@@ -250,7 +250,6 @@
   <string name="encryption_cipher">Krypteringschiffer</string>
   <string name="packet_auth">Paketautentisering</string>
   <string name="auth_dialog_title">Ange autentiseringsmetod för paket</string>
-  <string name="mobile_info_extended">Kör på %1$s (%2$s) %3$s, Android API %4$d, version %5$s, %6$s</string>
   <string name="built_by">byggd av %s</string>
   <string name="debug_build">felsöknings bygge</string>
   <string name="official_build">officiellt bygge</string>
diff --git a/main/src/main/res/values-tr/strings.xml b/main/src/main/res/values-tr/strings.xml
index 7375af3a..f80cd7e8 100755
--- a/main/src/main/res/values-tr/strings.xml
+++ b/main/src/main/res/values-tr/strings.xml
@@ -259,7 +259,6 @@
   <string name="encryption_cipher">Şifre şifresi</string>
   <string name="packet_auth">Paket kimlik doğrulama</string>
   <string name="auth_dialog_title">Paket kimlik doğrulama yöntemini girin</string>
-  <string name="mobile_info_extended">Çalışan %1$s (%2$s) %3$s, Android API %4$d, sürüm %5$s, %6$s</string>
   <string name="built_by">%s tarafından inşa</string>
   <string name="debug_build">hata ayıklama yapı</string>
   <string name="official_build">resmi yapı</string>
diff --git a/main/src/main/res/values-uk/strings.xml b/main/src/main/res/values-uk/strings.xml
index f0427d59..d73d1323 100755
--- a/main/src/main/res/values-uk/strings.xml
+++ b/main/src/main/res/values-uk/strings.xml
@@ -259,7 +259,6 @@
   <string name="encryption_cipher">Алгоритм шифрування</string>
   <string name="packet_auth">Пакети автентифікації</string>
   <string name="auth_dialog_title">Введіть метод автентифікації пакетів</string>
-  <string name="mobile_info_extended">Запущено на %1$s (%2$s) %3$s, Android API %4$d, версії %5$s, %6$s</string>
   <string name="built_by">побудована по %s</string>
   <string name="debug_build">відлагоджувальна збірка</string>
   <string name="official_build">Офіційна збірка</string>
diff --git a/main/src/main/res/values-vi/strings.xml b/main/src/main/res/values-vi/strings.xml
index 0ebe878c..f4cd4d77 100755
--- a/main/src/main/res/values-vi/strings.xml
+++ b/main/src/main/res/values-vi/strings.xml
@@ -259,7 +259,6 @@
   <string name="encryption_cipher">Mã hóa mật mã</string>
   <string name="packet_auth">Gói xác thực</string>
   <string name="auth_dialog_title">Nhập phương thức xác thực gói</string>
-  <string name="mobile_info_extended">Đang chạy trên %1$s (%2$s) %3$s, Android API %4$d, phiên bản %5$s, %6$s</string>
   <string name="built_by">được xây dựng bởi %s</string>
   <string name="debug_build">bản dựng gỡ lỗi</string>
   <string name="official_build">bản dựng chính thức</string>
diff --git a/main/src/main/res/values-zh-rCN/strings.xml b/main/src/main/res/values-zh-rCN/strings.xml
index 6f726877..570e900d 100755
--- a/main/src/main/res/values-zh-rCN/strings.xml
+++ b/main/src/main/res/values-zh-rCN/strings.xml
@@ -261,7 +261,6 @@
   <string name="encryption_cipher">加密算法(cipher)</string>
   <string name="packet_auth">数据包验证</string>
   <string name="auth_dialog_title">数据包验证方式</string>
-  <string name="mobile_info_extended">当前运行环境 %1$s (%2$s) %3$s，Android API %4$d，版本 %5$s，%6$s</string>
   <string name="built_by">由 %s 构建</string>
   <string name="debug_build">调试版本</string>
   <string name="official_build">正式版本</string>
diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml
index 6bc6941a..2697266b 100755
--- a/main/src/main/res/values/strings.xml
+++ b/main/src/main/res/values/strings.xml
@@ -178,7 +178,7 @@
     <string name="keychain_nocacert">No CA Certificate returned while reading from Android keystore. Authentication will probably fail.</string>
     <string name="show_log_summary">Shows the log window on connect. The log window can always be accessed from the notification status.</string>
     <string name="show_log_window">Show log window</string>
-    <string name="mobile_info">Running on %1$s (%2$s) %3$s, Android API %4$d, ABI %5$s</string>
+    <string name="mobile_info">%10$s %9$s running on %3$s %1$s (%2$s), Android %6$s (%7$s) API %4$d, Build %7$s ABI %5$s, (%8$s)</string>
     <string name="error_rsa_sign">Error signing with Android keystore key %1$s: %2$s</string>
     <string name="faq_system_dialogs">The VPN connection warning telling you that this app can intercept all traffic is imposed by the system to prevent abuse of the VPNService API.\nThe VPN connection notification (The key symbol) is also imposed by the Android system to signal an ongoing VPN connection. On some images this notification plays a sound.\nAndroid introduced these system dialogs for your own safety and made sure that they cannot be circumvented. (On some images this unfortunately includes a notification sound)</string>
     <string name="faq_system_dialogs_title">Connection warning and notification sound</string>
@@ -258,7 +258,6 @@
     <string name="encryption_cipher">Encryption cipher</string>
     <string name="packet_auth">Packet authentication</string>
     <string name="auth_dialog_title">Enter packet authentication method</string>
-    <string name="mobile_info_extended">Running on %1$s (%2$s) %3$s, Android API %4$d, version %5$s, %6$s</string>
     <string name="built_by">built by %s</string>
     <string name="debug_build">debug build</string>
     <string name="official_build">official build</string>
-- 
cgit v1.2.3