Merge branch 'origin_0.9.8' into 8823_cw_tablet_layout

5 files changed, 39 insertions, 9 deletions

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a8a63e4b..53ead009 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,6 +6,8 @@
     <color name="colorError">#ef9a9a</color>
     <color name="colorSuccess">#a5d6a7</color>
 
+    <color name="black800">#424242</color>
+
     <color name="red200">#ef9a9a</color>
     <color name="pink200">#f48fb1</color>
     <color name="purple200">#ce93d8</color>
@@ -23,4 +25,6 @@
     <color name="orange200">#ffcc80</color>
     <color name="deepOrange200">#ffab91</color>
 
+    <color name="white">#ffffff</color>
+
 </resources>
diff --git a/app/src/main/res/values/refs.xml b/app/src/main/res/values/refs.xml
index 2b00d5b5..c968b05c 100644
--- a/app/src/main/res/values/refs.xml
+++ b/app/src/main/res/values/refs.xml
@@ -13,15 +13,15 @@
     <drawable name="ic_menu_view">@android:drawable/ic_menu_view</drawable>
     <drawable name="ic_menu_delete">@android:drawable/ic_menu_delete</drawable>
     <drawable name="ic_menu_edit">@android:drawable/ic_menu_edit</drawable>
-    <!--<drawable name="ic_menu_import">@drawable/ic_menu_archive</drawable>-->
-    <!--<drawable name="vpn_item_edit">@drawable/vpn_item_settings </drawable>-->
+    <drawable name="ic_menu_import">@drawable/ic_menu_archive</drawable>
+    <drawable name="vpn_item_edit">@drawable/vpn_item_settings </drawable>
     <drawable name="ic_menu_add">@android:drawable/ic_menu_add</drawable>
     <drawable name="ic_dialog_alert">@android:drawable/ic_dialog_alert</drawable>
     <drawable name="ic_menu_add_grey">@android:drawable/ic_menu_add</drawable>
-    <!--<drawable name="ic_menu_import_grey">@drawable/ic_menu_archive</drawable>-->
+    <drawable name="ic_menu_import_grey">@drawable/ic_menu_archive</drawable>
     <drawable name="ic_menu_delete_grey">@android:drawable/ic_menu_delete</drawable>
-    <!--<drawable name="ic_menu_copy">@drawable/ic_menu_copy_holo_light</drawable>-->
-    <!--<drawable name="ic_receipt">@drawable/ic_menu_log</drawable> -->
+    <drawable name="ic_menu_copy">@drawable/ic_menu_copy_holo_light</drawable>
+    <drawable name="ic_receipt">@drawable/ic_menu_log</drawable>
     <drawable name="ic_sort">@android:drawable/ic_menu_sort_by_size</drawable>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings-icsopenvpn.xml b/app/src/main/res/values/strings-icsopenvpn.xml
index 52abd9a5..5094b909 100755
--- a/app/src/main/res/values/strings-icsopenvpn.xml
+++ b/app/src/main/res/values/strings-icsopenvpn.xml
@@ -436,16 +436,34 @@
     <string name="kbits_per_second">%.1f kbit/s</string>
     <string name="mbits_per_second">%.1f Mbit/s</string>
     <string name="gbits_per_second">%.1f Gbit/s</string>
-    <string name="weakmd">&lt;p>Starting with OpenSSL version 1.1, OpenSSL rejects weak signatures in certificates like MD5.&lt;/p>&lt;p>&lt;b>MD5 signatures are insecure and should not be used anymore.&lt;/b> MD5 collisions can be created in &lt;a href="https://natmchugh.blogspot.de/2015/02/create-your-own-md5-collisions.html">few hours at a minimal cost.&lt;/a>. You should update the VPN certificates as soon as possible.&lt;/p>&lt;p>Unfortunately, older easy-rsa distributions included the config option "default_md md5". If you are using an old easy-rsa version, update to the &lt;a href="https://github.com/OpenVPN/easy-rsa/releases">latest version&lt;/a>) or change md5 to sha256 and regenerate your certificates.&lt;/p>&lt;p>If you really want to use old and broken certificates use the custom configuration option tls-cipher "DEFAULT:@SECLEVEL=0" under advanced configuration or as additional line in your imported configuration&lt;/p></string>
-
-<string name="volume_byte">%.0f B</string>
+    <string name="weakmd">&lt;p>Starting with OpenSSL version 1.1, OpenSSL rejects weak signatures in certificates like
+        MD5.&lt;/p>&lt;p>&lt;b>MD5 signatures are completely insecure and should not be used anymore.&lt;/b> MD5
+        collisions can be created in &lt;a
+        href="https://natmchugh.blogspot.de/2015/02/create-your-own-md5-collisions.html">few hours at a minimal cost.&lt;/a>.
+        You should update the VPN certificates as soon as possible.&lt;/p>&lt;p>Unfortunately, older easy-rsa
+        distributions included the config option "default_md md5". If you are using an old easy-rsa version, update to
+        the &lt;a href="https://github.com/OpenVPN/easy-rsa/releases">latest version&lt;/a>) or change md5 to sha256 and
+        regenerate your certificates.&lt;/p>&lt;p>If you really want to use old and broken certificates use the custom
+        configuration option tls-cipher "DEFAULT:@SECLEVEL=0" under advanced configuration or as additional line in your
+        imported configuration&lt;/p>
+    </string>
+    <string name="volume_byte">%.0f B</string>
     <string name="volume_kbyte">%.1f kB</string>
     <string name="volume_mbyte">%.1f MB</string>
     <string name="volume_gbyte">%.1f GB</string>
     <string name="channel_name_background">Connection statistics</string>
     <string name="channel_description_background">Ongoing statistics of the established OpenVPN connection</string>
     <string name="channel_name_status">Connection status change</string>
-    <string name="channel_description_status">Status changes of the  OpenVPN connection (Connecting, authenticating,…)</string>
+    <string name="channel_description_status">Status changes of the OpenVPN connection (Connecting, authenticating,…)</string>
     <string name="weakmd_title">Weak (MD5) hashes in certificate signature (SSL_CTX_use_certificate md too weak)</string>
+    <string name="title_activity_open_sslspeed">OpenSSL Speed Test</string>
+    <string name="openssl_cipher_name">OpenSSL cipher names</string>
+    <string name="osslspeedtest">OpenSSL Crypto Speed test</string>
+    <string name="openssl_error">OpenSSL returned an error</string>
+    <string name="running_test">Running test…</string>
+    <string name="test_algoirhtms">Test selected algorithms</string>
+    <string name="all_app_prompt">An external app tries to control %s. The app requesting access cannot be determined. Allowing this app grants ALL apps access.</string>
+    <string name="openvpn3_nostatickeys">The OpenVPN 3 C++ implementation does not support static keys. Please change to OpenVPN 2.x under general settings.</string>
+    <string name="openvpn3_pkcs12">Using PKCS12 files directly with OpenVPN 3 C++ implementation is not supported. Please import the pkcs12 files into the Android keystore or change to OpenVPN 2.x under general settings.</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 01715c32..c1443138 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,6 +85,7 @@
     <string name="vpn.button.turn.on">Turn on</string>
     <string name="vpn.button.turn.off">Turn off</string>
     <string name="vpn_button_turn_off_blocking">Stop blocking</string>
+    <string name="vpn_securely_routed">Your traffic is securely routed through:</string>
     <string name="bitmask_log">Bitmask Log</string>
     <string name="title_activity_main">Bitmask</string>
     <string name="log_fragment_title">Log</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 230f52ba..4e845384 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -66,4 +66,11 @@
 
     <style name="BitmaskActivity">
     </style>
+
+    <style name="BitmaskButtonBlack" parent="android:Widget.Button">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:background">@color/black800</item>
+        <item name="android:textColor">@color/white</item>
+    </style>
+
 </resources>
\ No newline at end of file