From 1668b7649773a9842af3c8e3a69222c7abb01a99 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 3 Jul 2012 21:04:42 +0200
Subject: add fix to arrays.xml (closes issue #43) add translated by
 recognition add faq for system dialogs

---
 AndroidManifest.xml                     |  6 +++---
 res/layout/about.xml                    | 33 ++++++++++++++++++++++++---------
 res/layout/faq.xml                      | 11 +++++++++++
 res/values-de/strings.xml               |  2 +-
 res/values/arrays.xml                   |  2 +-
 res/values/strings.xml                  | 10 ++++++++--
 res/values/styles.xml                   |  2 +-
 src/de/blinkt/openvpn/MainActivity.java |  9 +++++++++
 8 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ca86ced3..7c8f244f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,16 +17,16 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.blinkt.openvpn"
-    android:versionCode="34"
+    android:versionCode="35"
     android:versionName="0.5.10" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <!-- <uses-permission android:name="com.android.vending.BILLING" /> -->
+    
 
     <uses-sdk android:minSdkVersion="14" />
 
-    <!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
-
     <application
         android:icon="@drawable/icon"
         android:label="@string/app" >
diff --git a/res/layout/about.xml b/res/layout/about.xml
index a66a0cc9..6e7f48e2 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -8,38 +8,53 @@
         android:layout_height="wrap_content"
         android:orientation="vertical" >
 
+        <TextView
+            android:id="@+id/version"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="10sp" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/version" />
+            android:autoLink="all"
+            android:text="@string/copyright_blinktgui" />
+
         <Space
             android:layout_width="match_parent"
             android:layout_height="10sp" />
-        
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/copyright_blinktgui"
-            android:autoLink="all" />
+            android:autoLink="all"
+            android:text="@string/copyright_guicode" />
+
         <Space
             android:layout_width="match_parent"
             android:layout_height="10sp" />
-        <TextView 
+
+        <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-        	android:text="@string/copyright_guicode"
-        	android:autoLink="all" />
-        
+            android:autoLink="all"
+            android:text="@string/translationby" />
+
         <Space
             android:layout_width="match_parent"
-            android:layout_height="20sp" />
+            android:layout_height="10sp" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/copyright_others" />
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="10sp" />
+        
 
         <TextView
             android:layout_width="match_parent"
diff --git a/res/layout/faq.xml b/res/layout/faq.xml
index 691a2ead..4107ea7e 100644
--- a/res/layout/faq.xml
+++ b/res/layout/faq.xml
@@ -8,6 +8,17 @@
         android:layout_height="wrap_content"
         android:orientation="vertical" >
 
+        
+        <TextView
+            style="@style/faqhead"
+            android:text="@string/faq_system_dialogs_title" />
+        
+        
+        <TextView
+            style="@style/faqitem"
+            android:text="@string/faq_system_dialogs" />
+        
+        
         <TextView
             style="@style/faqhead"
             android:text="@string/tap_mode" />
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7e6216da..e11056c0 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -156,7 +156,7 @@
     <string name="file_icon">Datei Symbol</string>
     <string name="generated_config">Generierte Konfiguration</string>
     <string name="copyright_guicode">Quellcode und Iusse tracker unter http://code.google.com/p/ics-openvpn/ verfügbar</string>
-    <string name="copyright_others">Dieses Programm nutzte die folgenden Komponenten. Die kompletten Lizenzdetails sind im Quelltext verfügbar</string>
+    <string name="copyright_others">Dieses Programm nutzt die folgenden Komponenten. Die kompletten Lizenzdetails sind im Quelltext verfügbar</string>
     <string name="tls_authentication">TLS Authentifizierung</string>
     <string name="faq_security_title">Bemerkungen zur Sicherheit</string>
     <string name="generalsettings">Allgemeine Einstellungen</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 2b2eaf65..8584da1f 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -4,7 +4,7 @@
     <string-array name="vpn_types">
         <item>Certificates</item>
         <item>PKCS12 File</item>
-        <item>Android Certficate</item>
+        <item>Android Certificate</item>
         <item>Username/Password</item>
         <item>Static Keys</item>
         <item>User/PW + Certificates</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 59b89042..e764b4e8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -212,7 +212,6 @@
     <string name="netstatus">Network Status: %s</string>
     <string name="extracahint">The CA cert is usually returned from the Android Keystore. Specify a separate certificate if you get certificate verification errors.</string>
     <string name="select_file">Select</string>
-
     <string name="keychain_nocacert">No CA Certificate returned while reading from Android keystore. Auhtentication 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>
@@ -221,5 +220,12 @@
     <string name="mobile_info">Running on %1$s (%2$s) %3$s, Android API %4$d</string>
     <string name="error_rsa_sign">Error signing with Android keystore key %1$s: %2$s</string>
     <string name="keychain_jellybeans">Reading from Android Keystore does not work in Jelly Beans (Google change the way private keys are returned)</string>
-</resources>
+    <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 dialog are for your own safety and made sure that they cannot be circumenvented. (On some images this unfortunely includes a notifciation sound)</string>
+    <string name="faq_system_dialogs_title">Connection warning and notification sound</string>
+    <!--  <string name="translationby"></string> -->
+    <!--
+    When translating use a string like this: --> 
+    <string name="translationby">English translation by Arne Schwabe&lt;arne@rfc2549.org></string>
+    
 
+</resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c4d6a1d2..d549b596 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -37,7 +37,7 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
-        <item name="android:singleLine">true</item>
+        <!-- <item name="android:singleLine">true</item> -->
     </style>
 
     <style name="accountSetupButton">
diff --git a/src/de/blinkt/openvpn/MainActivity.java b/src/de/blinkt/openvpn/MainActivity.java
index d9169284..63745cce 100644
--- a/src/de/blinkt/openvpn/MainActivity.java
+++ b/src/de/blinkt/openvpn/MainActivity.java
@@ -10,6 +10,15 @@ public class MainActivity extends PreferenceActivity {
 	@Override
 	public void onBuildHeaders(List<Header> target) {
 		loadHeadersFromResource(R.xml.main_headers, target);
+		
+
+		String translatedby = getString(R.string.translationby);
+		if(!translatedby.equals("")) {
+			Header translation = new Header();
+			translation.title = "Translation";
+			translation.summary = translatedby;
+			target.add(translation);
+		}
 	}
 	
 	@Override
-- 
cgit v1.2.3