diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-10-26 14:43:43 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-10-26 14:43:43 +0200 |
| commit | 4d966ce3ba862ccb3d45b66d3c5e24db157dca5c (patch) | |
| tree | 56205bb2dcbe8173b66380bec84936db8d5215a7 /AndroidManifest.xml | |
| parent | 86d9cc5eba96c51d5c2866b46afdb1d134563d0b (diff) | |
| parent | fd1dbd411e61ad12e79fab7d700782dd76135232 (diff) | |
Merge changes
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6677201f..ad16b0ad 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -17,16 +17,14 @@ <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" /> <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 |