summaryrefslogtreecommitdiff
path: root/app/src/main/res/values
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-05-28 17:15:44 +0200
committerParménides GV <parmegv@sdf.org>2014-05-28 17:15:44 +0200
commit6fcd101fcbc7779ffd7239cc35e5c3359ae38fcf (patch)
tree190d57ad5785b1397d6a8346726136b83d0aa870 /app/src/main/res/values
parenta0a7be518a758ad3c17111e8a5f3694d1a711d73 (diff)
Resources merge correctly.
Diffstat (limited to 'app/src/main/res/values')
-rwxr-xr-xapp/src/main/res/values/strings-icsopenvpn.xml2
-rw-r--r--app/src/main/res/values/untranslatable.xml41
2 files changed, 42 insertions, 1 deletions
diff --git a/app/src/main/res/values/strings-icsopenvpn.xml b/app/src/main/res/values/strings-icsopenvpn.xml
index a5424c39..6ab41787 100755
--- a/app/src/main/res/values/strings-icsopenvpn.xml
+++ b/app/src/main/res/values/strings-icsopenvpn.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <!-- Generated by crowdin.net -->
<resources>
+
+ <string name="address">Server Address:</string>
<string name="port">Server Port:</string>
<string name="location">Location</string>
<string name="cant_read_folder">Unable to read directory</string>
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index 6435bfbf..4c652f20 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -16,4 +16,43 @@
<string name="lzo" translatable="false">LZO</string>
<string name="openssl" translatable="false">OpenSSL</string>
<string name="unknown_state" translatable="false">Unknown state</string>
-</resources>
+
+ <string name="copyright_blinktgui" translatable="false">Copyright 2012–2014 Arne Schwabe &lt;arne@rfc2549.org></string>
+
+ <string name="defaultserver" translatable="false">openvpn.uni-paderborn.de</string>
+ <string name="defaultport" translatable="false">1194</string>
+ <string name="copyright_file_dialog" translatable="false">File Dialog based on work by Alexander Ponomarev</string>
+
+
+
+ <string name="file_dialog" translatable="false">File Dialog</string>
+
+
+
+ <string name="permission_description">Allows another app to control OpenVPN</string>
+ <string name="bouncy_castle" translatable="false">Bouncy Castle Crypto APIs</string>
+ <string name="copyright_bouncycastle" translatable="false">Copyright © 2000–2012 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)</string>
+ <string name="state_user_vpn_permission" translatable="false">Waiting for user permission to use VPN API</string>
+ <string name="state_user_vpn_password" translatable="false">Waiting for user VPN password</string>
+ <string name="state_user_vpn_password_cancelled" translatable="false">VPN password input dialog cancelled</string>
+ <string name="state_user_vpn_permission_cancelled" translatable="false">VPN API permission dialog cancelled</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</resources> \ No newline at end of file