From 2a17ef5099efd05fe69c0e1eaf8b8445fc178304 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 19 Oct 2012 17:05:34 +0200
Subject: Make mime action description translatable

---
 AndroidManifest.xml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6677201f..70ff7769 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,10 +23,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    
-    
-    
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
     <!-- <uses-permission android:name="com.android.vending.BILLING" /> -->
 
     <uses-sdk android:minSdkVersion="14" />
@@ -40,7 +38,7 @@
             android:windowSoftInputMode="stateHidden" />
         <activity
             android:name=".LogWindow"
-            android:label="OpenVPN Log" />
+            android:label="@string/openvpn_log" />
         <activity android:name=".FileSelect" />
         <activity android:name=".MainActivity" >
             <intent-filter>
@@ -58,6 +56,7 @@
                 <action android:name="android.net.VpnService" />
             </intent-filter>
         </service>
+
         <receiver android:name=".OnBootReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -67,7 +66,7 @@
         <activity
             android:name=".ConfigConverter"
             android:label="Convert Config File" >
-            <intent-filter android:label="Import OpenVPN Config" >
+            <intent-filter android:label="@string/import_config" >
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -75,7 +74,7 @@
 
                 <data android:mimeType="application/x-openvpn-profile" />
             </intent-filter>
-            <intent-filter android:label="Import OpenVPN Config" >
+            <intent-filter android:label="@string/import_config" >
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -83,7 +82,7 @@
 
                 <data android:mimeType="application/ovpn" />
             </intent-filter>
-            <intent-filter android:label="Import OpenVPN Config" >
+            <intent-filter android:label="@string/import_config" >
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.BROWSABLE" />
@@ -116,4 +115,4 @@
         </activity-alias>
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
-- 
cgit v1.2.3


From fd1dbd411e61ad12e79fab7d700782dd76135232 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 26 Oct 2012 14:41:24 +0200
Subject: - Increase Version - Add FAQ Entry for energy consumption

---
 AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 70ff7769..ad16b0ad 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,8 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.blinkt.openvpn"
-    android:versionCode="51"
-    android:versionName="0.5.24" >
+    android:versionCode="52"
+    android:versionName="0.5.25" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-- 
cgit v1.2.3