summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-10-19 17:05:34 +0200
committerArne Schwabe <arne@rfc2549.org>2012-10-19 17:05:34 +0200
commit2a17ef5099efd05fe69c0e1eaf8b8445fc178304 (patch)
tree14e0c2a609fce3bc79055229e695469449e4ccf1
parent2d90483cf39feb89bb5ba2262513cb2a586490db (diff)
Make mime action description translatable
-rw-r--r--AndroidManifest.xml17
-rw-r--r--res/values/strings.xml2
2 files changed, 10 insertions, 9 deletions
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
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2625a028..69fb9e35 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -225,4 +225,6 @@
<string name="persisttun_summary">Do not fallback to no VPN connection when OpenVPN is reconnecting.</string>
<string name="persistent_tun_title">Persistent tun</string>
<string name="translation">Translation</string>
+ <string name="openvpn_log">OpenVPN Log</string>
+ <string name="import_config">Import OpenVPN configuration</string>
</resources>