From c206a91d320995f37f8abb33188bfd384249da3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 7 Apr 2014 20:43:34 +0200
Subject: Next step: compile jni sources correctly.

---
 app/src/main/res/values/arrays.xml         |   4 +
 app/src/main/res/values/attrs.xml          |   8 ++
 app/src/main/res/values/strings.xml        | 143 +++++++++++++++++++++++++++++
 app/src/main/res/values/styles.xml         |  37 ++++++++
 app/src/main/res/values/untranslatable.xml |  19 ++++
 5 files changed, 211 insertions(+)
 create mode 100644 app/src/main/res/values/arrays.xml
 create mode 100644 app/src/main/res/values/attrs.xml
 create mode 100644 app/src/main/res/values/strings.xml
 create mode 100644 app/src/main/res/values/styles.xml
 create mode 100644 app/src/main/res/values/untranslatable.xml

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
new file mode 100644
index 00000000..66f07a87
--- /dev/null
+++ b/app/src/main/res/values/arrays.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!--  Keep the order the same as the TYPE_ constants in VPNProfile -->
+</resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
new file mode 100644
index 00000000..cb503b86
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+   <declare-styleable name="FileSelectLayout">
+      <attr name="title" format="string|reference" />
+<!--     <attr name="taskid" format="integer" /> -->
+   </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
new file mode 100644
index 00000000..bcb6ecc9
--- /dev/null
+++ b/app/src/main/res/values/strings.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="cancel">Cancel</string>
+    <string name="ok">OK</string>
+    <string name="retry">Retry</string>
+    <string name="repository_url_text">Source code and issue tracker available at https://github.com/leapcode/bitmask_android/</string>
+    <string name="translation_project_text">Translations welcome and appreciated.  See our Transifex project at https://www.transifex.com/projects/p/bitmask-android/</string>
+    <string name="copyright_others">This program uses the following components; see the source code for full details on the licenses</string>
+    <string name="about">About Bitmask</string>
+    <string name="switch_provider_menu_option">Switch provider</string>
+    <string name="no_error_found">No error found</string>
+    <string name="config_error_found">Error in Configuration</string>
+    <string name="ipv4_format_error">Error parsing the IPv4 address</string>
+    <string name="custom_route_format_error">Error parsing the custom routes</string>
+    <string name="vpn_launch_title">Connect to VPN</string>
+    <string name="shortcut_profile_notfound">Profile specified in shortcut not found</string>
+    <string name="route_rejected">Route rejected by Android</string>
+    <string name="cancel_connection">Disconnect</string>
+    <string name="clear_log">clear log</string>
+    <string name="title_cancel">Cancel Confirmation</string>
+    <string name="cancel_connection_query">Disconnect the connected VPN/cancel the connection attempt?</string>
+    <string name="edit_vpn">Edit VPN Settings</string>
+    <string name="tun_error_helpful">On some custom ICS images the permission on /dev/tun might be wrong, or the tun module might be missing completely.</string>
+    <string name="tun_open_error">Failed to open the tun interface</string>
+    <string name="error">"Error: "</string>
+    <string name="clear">Clear</string>
+    <string name="info">info</string>
+    <string name="show_connection_details">Show connection details</string>
+    <string name="last_openvpn_tun_config">Last interface configuration from OpenVPN:</string>
+    <string name="local_ip_info">Local IPv4: %1$s/%2$d IPv6: %3$s MTU: %4$d</string>
+    <string name="dns_server_info">DNS Server: %s</string>
+    <string name="dns_domain_info">DNS Domain: %s</string>
+    <string name="routes_info">Routes: %s</string>
+    <string name="routes_info6">Routes IPv6: %s</string>
+    <string name="ip_not_cidr">Got interface information %1$s and %2$s, assuming second address is peer address of remote. Using /32 netmask for local IP. Mode given by OpenVPN is \"%3$s\".</string>
+    <string name="route_not_cidr">Cannot make sense of %1$s and %2$s as IP route with CIDR netmask, using /32 as netmask.</string>
+    <string name="route_not_netip">Corrected route %1$s/%2$s to %3$s/%2$s</string>
+    <string name="keychain_access">Cannot access the Android Keychain Certificates. This can be caused by a firmware upgrade or by restoring a backup of the app/app settings. Please edit the VPN and reselect the certificate under basic settings to recreate the permission to access the certificate.</string>
+    <string name="version_info">%1$s %2$s</string>
+    <string name="send_logfile">Send log file</string>
+    <string name="send">Send</string>
+    <string name="bitmask_openvpn_log_file">Bitmask OpenVPN log file</string>
+    <string name="copied_entry">Copied log entry to clip board</string>
+    <string name="no_vpn_support_image">Your image does not support the VPNService API, sorry :(</string>
+    <string name="opentun_no_ipaddr">Refusing to open tun device without IP information</string>
+    <string name="speed_waiting">Waiting for state message…</string>
+    <string name="converted_profile">imported profile</string>
+    <string name="converted_profile_i">imported profile %d</string>
+    <string name="error_empty_username">The username must not be empty.</string>
+    <string name="pkcs12_file_encryption_key">PKCS12 File Encryption Key</string>
+    <string name="private_key_password">Private Key Password</string>
+    <string name="password">Password</string>
+    <string name="building_configration">Building configuration…</string>
+    <string name="cert_from_keystore">Got certificate \'%s\' from Keystore</string>
+    <string name="netstatus">Network Status: %s</string>
+    <string name="keychain_nocacert">No CA Certificate returned while reading from Android keystore. Authentication will probably fail.</string>
+    <string name="mobile_info">Running on %1$s (%2$s) %3$s, Android API %4$d</string>
+    <string name="error_rsa_sign">Error signing with Android keystore key %1$s: %2$s</string>
+    <string name="translationby">English translation by Arne Schwabe &lt;arne@rfc2549.org&gt;</string>
+    <string name="warn_no_dns">No DNS servers being used. Name resolution may not work. Consider setting custom DNS Servers</string>
+    <string name="dns_add_error">Could not add DNS Server \"%1$s\", rejected by the system: %2$s</string>
+    <string name="getproxy_error">Error getting proxy settings: %s</string>
+    <string name="using_proxy">Using proxy %1$s %2$d</string>
+    <string name="ignore">Ignore</string>
+    <string name="restart">Restart</string>
+    <string name="restart_vpn_after_change">Configuration changes are applied after restarting the VPN. (Re)start the VPN now?</string>
+    <string name="configuration_changed">Configuration changed</string>
+    <string name="minidump_generated">OpenVPN crashed unexpectedly. Please consider using the send Minidump option in the main menu</string>
+    <string name="notifcation_title">Bitmask - %s</string>
+    <string name="state_connecting">Connecting</string>
+    <string name="state_wait">Waiting for server reply</string>
+    <string name="state_auth">Authenticating</string>
+    <string name="state_get_config">Getting client configuration</string>
+    <string name="state_assign_ip">Assigning IP addresses</string>
+    <string name="state_add_routes">Adding routes</string>
+    <string name="state_connected">Connected</string>
+    <string name="state_reconnecting">Reconnecting</string>
+    <string name="state_exiting">Exiting</string>
+    <string name="state_noprocess">Not running</string>
+    <string name="state_resolve">Resolving host names</string>
+    <string name="state_tcp_connect">Connecting (TCP)</string>
+    <string name="state_auth_failed">Authentication failed</string>
+    <string name="state_nonetwork">Waiting for usable network</string>
+    <string name="menu_settings">Settings</string>
+    <string name="title_activity_dashboard">Bitmask</string>
+    <string name="provider_label">Provider:</string>
+    <string name="provider_label_none">No provider configured</string>
+    <string name="eip_settings_button_description">Access EIP connection settings</string>
+    <string name="status_unknown">Status unknown.</string>
+    <string name="future_anonymous_secured_status">Connection will be secure using an anonymous certificate.</string>
+    <string name="anonymous_secured_status">Connection secure using an anonymous certificate.</string>
+    <string name="future_authed_secured_status">Connection will be secure using your own certificate.</string>
+    <string name="authed_secured_status">Connection secure using your own certificate.</string>
+    <string name="eip_service_label">Encrypted Internet</string>
+    <string name="title_activity_configuration_wizard">Select a service provider</string>
+    <string name="new_provider_button">Add new Provider</string>
+    <string name="introduce_new_provider">Add a new service provider</string>
+    <string name="save">Save</string>
+    <string name="new_provider_uri">Domain name</string>
+    <string name="valid_url_entered">It seems your URL is well formed</string>
+    <string name="not_valid_url_entered">It seems your URL is not well formed</string>
+    <string name="provider_details_fragment_title">Provider details</string>
+    <string name="use_anonymously_button">Use anonymously</string>
+    <string name="username_hint">username</string>
+    <string name="username_ask">Please enter your username</string>
+    <string name="password_hint">password</string>
+    <string name="user_message">User message</string>
+    <string name="title_about_activity">About Bitmask"</string>
+    <string name="error_srp_math_error_user_message">Try again: server math error.</string>    
+    <string name="error_bad_user_password_user_message">Incorrect username or password.</string>
+    <string name="error_not_valid_password_user_message">It should have at least 8 characters.</string>
+    <string name="error_client_http_user_message">Try again: Client HTTP error</string>
+    <string name="error_io_exception_user_message">Try again: I/O error</string>
+    <string name="error_json_exception_user_message">Try again: Bad response from the server</string>
+    <string name="error_no_such_algorithm_exception_user_message">Update the app</string>
+    <string name="login_button">Log In</string>
+    <string name="logout_button">Log Out</string>
+    <string name="danger_checkbox">Skip security check</string>
+    <string name="setup_error_title">Configuration Error</string>
+    <string name="setup_error_configure_button">Configure</string>
+    <string name="setup_error_close_button">Exit</string>
+    <string name="setup_error_text">There was an error configuring Bitmask with your chosen provider.\n\nYou may choose to reconfigure, or exit and configure a provider upon next launch.</string>
+    <string name="server_unreachable_message">Server is unreachable, please try again.</string>
+    <string name="malformed_url">It doesn\'t seem to be a Bitmask provider.</string>
+    <string name="certificate_error">This is not a trusted Bitmask provider.</string>
+    <string name="configuring_provider">Configuring provider</string>
+    <string name="incorrectly_downloaded_certificate_message">Your anon cert was not downloaded</string>
+    <string name="authenticating_message">Logging in</string>
+    <string name="logout_message">Logging out from this session.</string>
+    <string name="log_out_failed_message">Didn\'t logged out.</string>
+    <string name="succesful_authentication_message">Authentication succeeded.</string>
+    <string name="authentication_failed_message">Authentication failed.</string>
+    <string name="successful_authed_cert_downloaded_message">Your own cert has been correctly downloaded.</string>
+    <string name="authed_cert_download_failed_message">Your own cert has incorrectly been downloaded.</string>
+    <string name="eip_status_start_pending">Initiating connection</string>
+    <string name="eip_cancel_connect_title">Cancel connection?</string>
+    <string name="eip_cancel_connect_text">There is a connection attempt in progress.  Do you wish to cancel it?</string>
+    <string name="eip_cancel_connect_cancel">Yes</string>
+    <string name="eip_cancel_connect_false">No</string>
+    <string name="eip_state_not_connected">"Not running! Connection not secure!"</string>
+    <string name="eip_state_connected">Connection Secure.</string>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 00000000..1c20cbcd
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="item">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+        <item name="android:singleLine">true</item>
+    </style>
+    
+    <style name="faqitem">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+    </style>
+   
+    
+    <style name="faqhead">
+        <item name="android:paddingTop">10sp</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+        <!-- <item name="android:singleLine">true</item> -->
+    </style>
+
+    <style name="accountSetupButton">
+        <item name="android:layout_width">160sp</item>
+        <item name="android:layout_height">40sp</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+    </style>
+
+     <style name="Theme.CreateShortCut" parent="android:Theme.Holo.DialogWhenLarge">
+    </style>
+
+    
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
new file mode 100644
index 00000000..6435bfbf
--- /dev/null
+++ b/app/src/main/res/values/untranslatable.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="app" translatable="false">Bitmask</string>
+	<string name="app_name" translatable="false">Bitmask</string>
+	
+    <string name="copyright_leapgui" translatable="false">Copyright 2012\nLEAP Encryption Access Project &lt;info@leap.se></string>
+    <string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. &lt;sales@openvpn.net>\n
+
+	  "OpenVPN" is a trademark of OpenVPN Technologies, Inc.</string>
+    <string name="lzo_copyright" translatable="false">Copyright © 1996 – 2011 Markus Franz Xaver Johannes Oberhumer</string>
+    <string name="copyright_openssl" translatable="false">        This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit\n
+        Copyright © 1998-2008 The OpenSSL Project. All rights reserved.\n\n
+        This product includes cryptographic software written by Eric Young (eay@cryptsoft.com)\n
+        Copyright © 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.</string>
+    <string name="openvpn" translatable="false">OpenVPN</string>
+    <string name="lzo" translatable="false">LZO</string>
+    <string name="openssl" translatable="false">OpenSSL</string>
+    <string name="unknown_state" translatable="false">Unknown state</string>
+</resources>
-- 
cgit v1.2.3


From 3c3421afd8f74a3aa8d1011de07a8c18f9549210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 8 Apr 2014 12:04:17 +0200
Subject: Rename app->bitmask_android

This way, gradle commands generate apks correctly named.
---
 app/src/main/res/values/arrays.xml         |   4 -
 app/src/main/res/values/attrs.xml          |   8 --
 app/src/main/res/values/strings.xml        | 143 -----------------------------
 app/src/main/res/values/styles.xml         |  37 --------
 app/src/main/res/values/untranslatable.xml |  19 ----
 5 files changed, 211 deletions(-)
 delete mode 100644 app/src/main/res/values/arrays.xml
 delete mode 100644 app/src/main/res/values/attrs.xml
 delete mode 100644 app/src/main/res/values/strings.xml
 delete mode 100644 app/src/main/res/values/styles.xml
 delete mode 100644 app/src/main/res/values/untranslatable.xml

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
deleted file mode 100644
index 66f07a87..00000000
--- a/app/src/main/res/values/arrays.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<!--  Keep the order the same as the TYPE_ constants in VPNProfile -->
-</resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
deleted file mode 100644
index cb503b86..00000000
--- a/app/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<resources>
-   <declare-styleable name="FileSelectLayout">
-      <attr name="title" format="string|reference" />
-<!--     <attr name="taskid" format="integer" /> -->
-   </declare-styleable>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
deleted file mode 100644
index bcb6ecc9..00000000
--- a/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="cancel">Cancel</string>
-    <string name="ok">OK</string>
-    <string name="retry">Retry</string>
-    <string name="repository_url_text">Source code and issue tracker available at https://github.com/leapcode/bitmask_android/</string>
-    <string name="translation_project_text">Translations welcome and appreciated.  See our Transifex project at https://www.transifex.com/projects/p/bitmask-android/</string>
-    <string name="copyright_others">This program uses the following components; see the source code for full details on the licenses</string>
-    <string name="about">About Bitmask</string>
-    <string name="switch_provider_menu_option">Switch provider</string>
-    <string name="no_error_found">No error found</string>
-    <string name="config_error_found">Error in Configuration</string>
-    <string name="ipv4_format_error">Error parsing the IPv4 address</string>
-    <string name="custom_route_format_error">Error parsing the custom routes</string>
-    <string name="vpn_launch_title">Connect to VPN</string>
-    <string name="shortcut_profile_notfound">Profile specified in shortcut not found</string>
-    <string name="route_rejected">Route rejected by Android</string>
-    <string name="cancel_connection">Disconnect</string>
-    <string name="clear_log">clear log</string>
-    <string name="title_cancel">Cancel Confirmation</string>
-    <string name="cancel_connection_query">Disconnect the connected VPN/cancel the connection attempt?</string>
-    <string name="edit_vpn">Edit VPN Settings</string>
-    <string name="tun_error_helpful">On some custom ICS images the permission on /dev/tun might be wrong, or the tun module might be missing completely.</string>
-    <string name="tun_open_error">Failed to open the tun interface</string>
-    <string name="error">"Error: "</string>
-    <string name="clear">Clear</string>
-    <string name="info">info</string>
-    <string name="show_connection_details">Show connection details</string>
-    <string name="last_openvpn_tun_config">Last interface configuration from OpenVPN:</string>
-    <string name="local_ip_info">Local IPv4: %1$s/%2$d IPv6: %3$s MTU: %4$d</string>
-    <string name="dns_server_info">DNS Server: %s</string>
-    <string name="dns_domain_info">DNS Domain: %s</string>
-    <string name="routes_info">Routes: %s</string>
-    <string name="routes_info6">Routes IPv6: %s</string>
-    <string name="ip_not_cidr">Got interface information %1$s and %2$s, assuming second address is peer address of remote. Using /32 netmask for local IP. Mode given by OpenVPN is \"%3$s\".</string>
-    <string name="route_not_cidr">Cannot make sense of %1$s and %2$s as IP route with CIDR netmask, using /32 as netmask.</string>
-    <string name="route_not_netip">Corrected route %1$s/%2$s to %3$s/%2$s</string>
-    <string name="keychain_access">Cannot access the Android Keychain Certificates. This can be caused by a firmware upgrade or by restoring a backup of the app/app settings. Please edit the VPN and reselect the certificate under basic settings to recreate the permission to access the certificate.</string>
-    <string name="version_info">%1$s %2$s</string>
-    <string name="send_logfile">Send log file</string>
-    <string name="send">Send</string>
-    <string name="bitmask_openvpn_log_file">Bitmask OpenVPN log file</string>
-    <string name="copied_entry">Copied log entry to clip board</string>
-    <string name="no_vpn_support_image">Your image does not support the VPNService API, sorry :(</string>
-    <string name="opentun_no_ipaddr">Refusing to open tun device without IP information</string>
-    <string name="speed_waiting">Waiting for state message…</string>
-    <string name="converted_profile">imported profile</string>
-    <string name="converted_profile_i">imported profile %d</string>
-    <string name="error_empty_username">The username must not be empty.</string>
-    <string name="pkcs12_file_encryption_key">PKCS12 File Encryption Key</string>
-    <string name="private_key_password">Private Key Password</string>
-    <string name="password">Password</string>
-    <string name="building_configration">Building configuration…</string>
-    <string name="cert_from_keystore">Got certificate \'%s\' from Keystore</string>
-    <string name="netstatus">Network Status: %s</string>
-    <string name="keychain_nocacert">No CA Certificate returned while reading from Android keystore. Authentication will probably fail.</string>
-    <string name="mobile_info">Running on %1$s (%2$s) %3$s, Android API %4$d</string>
-    <string name="error_rsa_sign">Error signing with Android keystore key %1$s: %2$s</string>
-    <string name="translationby">English translation by Arne Schwabe &lt;arne@rfc2549.org&gt;</string>
-    <string name="warn_no_dns">No DNS servers being used. Name resolution may not work. Consider setting custom DNS Servers</string>
-    <string name="dns_add_error">Could not add DNS Server \"%1$s\", rejected by the system: %2$s</string>
-    <string name="getproxy_error">Error getting proxy settings: %s</string>
-    <string name="using_proxy">Using proxy %1$s %2$d</string>
-    <string name="ignore">Ignore</string>
-    <string name="restart">Restart</string>
-    <string name="restart_vpn_after_change">Configuration changes are applied after restarting the VPN. (Re)start the VPN now?</string>
-    <string name="configuration_changed">Configuration changed</string>
-    <string name="minidump_generated">OpenVPN crashed unexpectedly. Please consider using the send Minidump option in the main menu</string>
-    <string name="notifcation_title">Bitmask - %s</string>
-    <string name="state_connecting">Connecting</string>
-    <string name="state_wait">Waiting for server reply</string>
-    <string name="state_auth">Authenticating</string>
-    <string name="state_get_config">Getting client configuration</string>
-    <string name="state_assign_ip">Assigning IP addresses</string>
-    <string name="state_add_routes">Adding routes</string>
-    <string name="state_connected">Connected</string>
-    <string name="state_reconnecting">Reconnecting</string>
-    <string name="state_exiting">Exiting</string>
-    <string name="state_noprocess">Not running</string>
-    <string name="state_resolve">Resolving host names</string>
-    <string name="state_tcp_connect">Connecting (TCP)</string>
-    <string name="state_auth_failed">Authentication failed</string>
-    <string name="state_nonetwork">Waiting for usable network</string>
-    <string name="menu_settings">Settings</string>
-    <string name="title_activity_dashboard">Bitmask</string>
-    <string name="provider_label">Provider:</string>
-    <string name="provider_label_none">No provider configured</string>
-    <string name="eip_settings_button_description">Access EIP connection settings</string>
-    <string name="status_unknown">Status unknown.</string>
-    <string name="future_anonymous_secured_status">Connection will be secure using an anonymous certificate.</string>
-    <string name="anonymous_secured_status">Connection secure using an anonymous certificate.</string>
-    <string name="future_authed_secured_status">Connection will be secure using your own certificate.</string>
-    <string name="authed_secured_status">Connection secure using your own certificate.</string>
-    <string name="eip_service_label">Encrypted Internet</string>
-    <string name="title_activity_configuration_wizard">Select a service provider</string>
-    <string name="new_provider_button">Add new Provider</string>
-    <string name="introduce_new_provider">Add a new service provider</string>
-    <string name="save">Save</string>
-    <string name="new_provider_uri">Domain name</string>
-    <string name="valid_url_entered">It seems your URL is well formed</string>
-    <string name="not_valid_url_entered">It seems your URL is not well formed</string>
-    <string name="provider_details_fragment_title">Provider details</string>
-    <string name="use_anonymously_button">Use anonymously</string>
-    <string name="username_hint">username</string>
-    <string name="username_ask">Please enter your username</string>
-    <string name="password_hint">password</string>
-    <string name="user_message">User message</string>
-    <string name="title_about_activity">About Bitmask"</string>
-    <string name="error_srp_math_error_user_message">Try again: server math error.</string>    
-    <string name="error_bad_user_password_user_message">Incorrect username or password.</string>
-    <string name="error_not_valid_password_user_message">It should have at least 8 characters.</string>
-    <string name="error_client_http_user_message">Try again: Client HTTP error</string>
-    <string name="error_io_exception_user_message">Try again: I/O error</string>
-    <string name="error_json_exception_user_message">Try again: Bad response from the server</string>
-    <string name="error_no_such_algorithm_exception_user_message">Update the app</string>
-    <string name="login_button">Log In</string>
-    <string name="logout_button">Log Out</string>
-    <string name="danger_checkbox">Skip security check</string>
-    <string name="setup_error_title">Configuration Error</string>
-    <string name="setup_error_configure_button">Configure</string>
-    <string name="setup_error_close_button">Exit</string>
-    <string name="setup_error_text">There was an error configuring Bitmask with your chosen provider.\n\nYou may choose to reconfigure, or exit and configure a provider upon next launch.</string>
-    <string name="server_unreachable_message">Server is unreachable, please try again.</string>
-    <string name="malformed_url">It doesn\'t seem to be a Bitmask provider.</string>
-    <string name="certificate_error">This is not a trusted Bitmask provider.</string>
-    <string name="configuring_provider">Configuring provider</string>
-    <string name="incorrectly_downloaded_certificate_message">Your anon cert was not downloaded</string>
-    <string name="authenticating_message">Logging in</string>
-    <string name="logout_message">Logging out from this session.</string>
-    <string name="log_out_failed_message">Didn\'t logged out.</string>
-    <string name="succesful_authentication_message">Authentication succeeded.</string>
-    <string name="authentication_failed_message">Authentication failed.</string>
-    <string name="successful_authed_cert_downloaded_message">Your own cert has been correctly downloaded.</string>
-    <string name="authed_cert_download_failed_message">Your own cert has incorrectly been downloaded.</string>
-    <string name="eip_status_start_pending">Initiating connection</string>
-    <string name="eip_cancel_connect_title">Cancel connection?</string>
-    <string name="eip_cancel_connect_text">There is a connection attempt in progress.  Do you wish to cancel it?</string>
-    <string name="eip_cancel_connect_cancel">Yes</string>
-    <string name="eip_cancel_connect_false">No</string>
-    <string name="eip_state_not_connected">"Not running! Connection not secure!"</string>
-    <string name="eip_state_connected">Connection Secure.</string>
-</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
deleted file mode 100644
index 1c20cbcd..00000000
--- a/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="item">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
-        <item name="android:singleLine">true</item>
-    </style>
-    
-    <style name="faqitem">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-    </style>
-   
-    
-    <style name="faqhead">
-        <item name="android:paddingTop">10sp</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
-        <!-- <item name="android:singleLine">true</item> -->
-    </style>
-
-    <style name="accountSetupButton">
-        <item name="android:layout_width">160sp</item>
-        <item name="android:layout_height">40sp</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-    </style>
-
-     <style name="Theme.CreateShortCut" parent="android:Theme.Holo.DialogWhenLarge">
-    </style>
-
-    
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
deleted file mode 100644
index 6435bfbf..00000000
--- a/app/src/main/res/values/untranslatable.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="app" translatable="false">Bitmask</string>
-	<string name="app_name" translatable="false">Bitmask</string>
-	
-    <string name="copyright_leapgui" translatable="false">Copyright 2012\nLEAP Encryption Access Project &lt;info@leap.se></string>
-    <string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. &lt;sales@openvpn.net>\n
-
-	  "OpenVPN" is a trademark of OpenVPN Technologies, Inc.</string>
-    <string name="lzo_copyright" translatable="false">Copyright © 1996 – 2011 Markus Franz Xaver Johannes Oberhumer</string>
-    <string name="copyright_openssl" translatable="false">        This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit\n
-        Copyright © 1998-2008 The OpenSSL Project. All rights reserved.\n\n
-        This product includes cryptographic software written by Eric Young (eay@cryptsoft.com)\n
-        Copyright © 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.</string>
-    <string name="openvpn" translatable="false">OpenVPN</string>
-    <string name="lzo" translatable="false">LZO</string>
-    <string name="openssl" translatable="false">OpenSSL</string>
-    <string name="unknown_state" translatable="false">Unknown state</string>
-</resources>
-- 
cgit v1.2.3


From 1684c8f398922065a97e7da4dac4ac6a33cc5218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 9 Apr 2014 16:03:55 +0200
Subject: Back to the standard "app" module.

This return to "app" instead of "bitmask_android" is due to this reading: https://developer.android.com/sdk/installing/studio-build.html#projectStructure
I'll have to tweak the final apk name in build.gradle.
---
 app/src/main/res/values/arrays.xml         |   4 +
 app/src/main/res/values/attrs.xml          |   8 ++
 app/src/main/res/values/strings.xml        | 142 +++++++++++++++++++++++++++++
 app/src/main/res/values/styles.xml         |  37 ++++++++
 app/src/main/res/values/untranslatable.xml |  19 ++++
 5 files changed, 210 insertions(+)
 create mode 100644 app/src/main/res/values/arrays.xml
 create mode 100644 app/src/main/res/values/attrs.xml
 create mode 100644 app/src/main/res/values/strings.xml
 create mode 100644 app/src/main/res/values/styles.xml
 create mode 100644 app/src/main/res/values/untranslatable.xml

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
new file mode 100644
index 00000000..66f07a87
--- /dev/null
+++ b/app/src/main/res/values/arrays.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!--  Keep the order the same as the TYPE_ constants in VPNProfile -->
+</resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
new file mode 100644
index 00000000..cb503b86
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+   <declare-styleable name="FileSelectLayout">
+      <attr name="title" format="string|reference" />
+<!--     <attr name="taskid" format="integer" /> -->
+   </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
new file mode 100644
index 00000000..492c48c7
--- /dev/null
+++ b/app/src/main/res/values/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="cancel">Cancel</string>
+    <string name="ok">OK</string>
+    <string name="retry">Retry</string>
+    <string name="repository_url_text">Source code and issue tracker available at https://github.com/leapcode/bitmask_android/</string>
+    <string name="translation_project_text">Translations welcome and appreciated.  See our Transifex project at https://www.transifex.com/projects/p/bitmask-android/</string>
+    <string name="copyright_others">This program uses the following components; see the source code for full details on the licenses</string>
+    <string name="about">About Bitmask</string>
+    <string name="switch_provider_menu_option">Switch provider</string>
+    <string name="no_error_found">No error found</string>
+    <string name="config_error_found">Error in Configuration</string>
+    <string name="ipv4_format_error">Error parsing the IPv4 address</string>
+    <string name="custom_route_format_error">Error parsing the custom routes</string>
+    <string name="vpn_launch_title">Connect to VPN</string>
+    <string name="shortcut_profile_notfound">Profile specified in shortcut not found</string>
+    <string name="route_rejected">Route rejected by Android</string>
+    <string name="cancel_connection">Disconnect</string>
+    <string name="clear_log">clear log</string>
+    <string name="title_cancel">Cancel Confirmation</string>
+    <string name="cancel_connection_query">Disconnect the connected VPN/cancel the connection attempt?</string>
+    <string name="edit_vpn">Edit VPN Settings</string>
+    <string name="tun_error_helpful">On some custom ICS images the permission on /dev/tun might be wrong, or the tun module might be missing completely.</string>
+    <string name="tun_open_error">Failed to open the tun interface</string>
+    <string name="error">"Error: "</string>
+    <string name="clear">Clear</string>
+    <string name="info">info</string>
+    <string name="show_connection_details">Show connection details</string>
+    <string name="last_openvpn_tun_config">Last interface configuration from OpenVPN:</string>
+    <string name="local_ip_info">Local IPv4: %1$s/%2$d IPv6: %3$s MTU: %4$d</string>
+    <string name="dns_server_info">DNS Server: %s</string>
+    <string name="dns_domain_info">DNS Domain: %s</string>
+    <string name="routes_info">Routes: %s</string>
+    <string name="routes_info6">Routes IPv6: %s</string>
+    <string name="ip_not_cidr">Got interface information %1$s and %2$s, assuming second address is peer address of remote. Using /32 netmask for local IP. Mode given by OpenVPN is \"%3$s\".</string>
+    <string name="route_not_cidr">Cannot make sense of %1$s and %2$s as IP route with CIDR netmask, using /32 as netmask.</string>
+    <string name="route_not_netip">Corrected route %1$s/%2$s to %3$s/%2$s</string>
+    <string name="keychain_access">Cannot access the Android Keychain Certificates. This can be caused by a firmware upgrade or by restoring a backup of the app/app settings. Please edit the VPN and reselect the certificate under basic settings to recreate the permission to access the certificate.</string>
+    <string name="version_info">%1$s %2$s</string>
+    <string name="send_logfile">Send log file</string>
+    <string name="send">Send</string>
+    <string name="bitmask_openvpn_log_file">Bitmask OpenVPN log file</string>
+    <string name="copied_entry">Copied log entry to clip board</string>
+    <string name="no_vpn_support_image">Your image does not support the VPNService API, sorry :(</string>
+    <string name="opentun_no_ipaddr">Refusing to open tun device without IP information</string>
+    <string name="speed_waiting">Waiting for state message…</string>
+    <string name="converted_profile">imported profile</string>
+    <string name="converted_profile_i">imported profile %d</string>
+    <string name="error_empty_username">The username must not be empty.</string>
+    <string name="pkcs12_file_encryption_key">PKCS12 File Encryption Key</string>
+    <string name="private_key_password">Private Key Password</string>
+    <string name="password">Password</string>
+    <string name="building_configration">Building configuration…</string>
+    <string name="cert_from_keystore">Got certificate \'%s\' from Keystore</string>
+    <string name="netstatus">Network Status: %s</string>
+    <string name="keychain_nocacert">No CA Certificate returned while reading from Android keystore. Authentication will probably fail.</string>
+    <string name="mobile_info">Running on %1$s (%2$s) %3$s, Android API %4$d</string>
+    <string name="error_rsa_sign">Error signing with Android keystore key %1$s: %2$s</string>
+    <string name="translationby">English translation by Arne Schwabe &lt;arne@rfc2549.org&gt;</string>
+    <string name="warn_no_dns">No DNS servers being used. Name resolution may not work. Consider setting custom DNS Servers</string>
+    <string name="dns_add_error">Could not add DNS Server \"%1$s\", rejected by the system: %2$s</string>
+    <string name="getproxy_error">Error getting proxy settings: %s</string>
+    <string name="using_proxy">Using proxy %1$s %2$d</string>
+    <string name="ignore">Ignore</string>
+    <string name="restart">Restart</string>
+    <string name="restart_vpn_after_change">Configuration changes are applied after restarting the VPN. (Re)start the VPN now?</string>
+    <string name="configuration_changed">Configuration changed</string>
+    <string name="minidump_generated">OpenVPN crashed unexpectedly. Please consider using the send Minidump option in the main menu</string>
+    <string name="notifcation_title">Bitmask - %s</string>
+    <string name="state_connecting">Connecting</string>
+    <string name="state_wait">Waiting for server reply</string>
+    <string name="state_auth">Authenticating</string>
+    <string name="state_get_config">Getting client configuration</string>
+    <string name="state_assign_ip">Assigning IP addresses</string>
+    <string name="state_add_routes">Adding routes</string>
+    <string name="state_connected">Connected</string>
+    <string name="state_reconnecting">Reconnecting</string>
+    <string name="state_exiting">Exiting</string>
+    <string name="state_noprocess">Not running</string>
+    <string name="state_resolve">Resolving host names</string>
+    <string name="state_tcp_connect">Connecting (TCP)</string>
+    <string name="state_auth_failed">Authentication failed</string>
+    <string name="state_nonetwork">Waiting for usable network</string>
+    <string name="menu_settings">Settings</string>
+    <string name="title_activity_dashboard">Bitmask</string>
+    <string name="provider_label">Provider:</string>
+    <string name="provider_label_none">No provider configured</string>
+    <string name="eip_settings_button_description">Access EIP connection settings</string>
+    <string name="status_unknown">Status unknown.</string>
+    <string name="future_anonymous_secured_status">Connection will be secure using an anonymous certificate.</string>
+    <string name="anonymous_secured_status">Connection secure using an anonymous certificate.</string>
+    <string name="future_authed_secured_status">Connection will be secure using your own certificate.</string>
+    <string name="authed_secured_status">Connection secure using your own certificate.</string>
+    <string name="eip_service_label">Encrypted Internet</string>
+    <string name="title_activity_configuration_wizard">Select a service provider</string>
+    <string name="new_provider_button">Add new Provider</string>
+    <string name="introduce_new_provider">Add a new service provider</string>
+    <string name="save">Save</string>
+    <string name="new_provider_uri">Domain name</string>
+    <string name="valid_url_entered">It seems your URL is well formed</string>
+    <string name="not_valid_url_entered">It seems your URL is not well formed</string>
+    <string name="provider_details_fragment_title">Provider details</string>
+    <string name="use_anonymously_button">Use anonymously</string>
+    <string name="username_hint">username</string>
+    <string name="username_ask">Please enter your username</string>
+    <string name="password_hint">password</string>
+    <string name="user_message">User message</string>
+    <string name="title_about_activity">About Bitmask"</string>
+    <string name="error_srp_math_error_user_message">Try again: server math error.</string>    
+    <string name="error_bad_user_password_user_message">Incorrect username or password.</string>
+    <string name="error_not_valid_password_user_message">It should have at least 8 characters.</string>
+    <string name="error_client_http_user_message">Try again: Client HTTP error</string>
+    <string name="error_io_exception_user_message">Try again: I/O error</string>
+    <string name="error_json_exception_user_message">Try again: Bad response from the server</string>
+    <string name="error_no_such_algorithm_exception_user_message">Update the app</string>
+    <string name="login_button">Log In</string>
+    <string name="logout_button">Log Out</string>
+    <string name="setup_error_title">Configuration Error</string>
+    <string name="setup_error_configure_button">Configure</string>
+    <string name="setup_error_close_button">Exit</string>
+    <string name="setup_error_text">There was an error configuring Bitmask with your chosen provider.\n\nYou may choose to reconfigure, or exit and configure a provider upon next launch.</string>
+    <string name="server_unreachable_message">Server is unreachable, please try again.</string>
+    <string name="malformed_url">It doesn\'t seem to be a Bitmask provider.</string>
+    <string name="certificate_error">This is not a trusted Bitmask provider.</string>
+    <string name="configuring_provider">Configuring provider</string>
+    <string name="incorrectly_downloaded_certificate_message">Your anon cert was not downloaded</string>
+    <string name="authenticating_message">Logging in</string>
+    <string name="logout_message">Logging out from this session.</string>
+    <string name="log_out_failed_message">Didn\'t logged out.</string>
+    <string name="succesful_authentication_message">Authentication succeeded.</string>
+    <string name="authentication_failed_message">Authentication failed.</string>
+    <string name="successful_authed_cert_downloaded_message">Your own cert has been correctly downloaded.</string>
+    <string name="authed_cert_download_failed_message">Your own cert has incorrectly been downloaded.</string>
+    <string name="eip_status_start_pending">Initiating connection</string>
+    <string name="eip_cancel_connect_title">Cancel connection?</string>
+    <string name="eip_cancel_connect_text">There is a connection attempt in progress.  Do you wish to cancel it?</string>
+    <string name="eip_cancel_connect_cancel">Yes</string>
+    <string name="eip_cancel_connect_false">No</string>
+    <string name="eip_state_not_connected">"Not running! Connection not secure!"</string>
+    <string name="eip_state_connected">Connection Secure.</string>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 00000000..1c20cbcd
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="item">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+        <item name="android:singleLine">true</item>
+    </style>
+    
+    <style name="faqitem">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+    </style>
+   
+    
+    <style name="faqhead">
+        <item name="android:paddingTop">10sp</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+        <!-- <item name="android:singleLine">true</item> -->
+    </style>
+
+    <style name="accountSetupButton">
+        <item name="android:layout_width">160sp</item>
+        <item name="android:layout_height">40sp</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+    </style>
+
+     <style name="Theme.CreateShortCut" parent="android:Theme.Holo.DialogWhenLarge">
+    </style>
+
+    
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
new file mode 100644
index 00000000..6435bfbf
--- /dev/null
+++ b/app/src/main/res/values/untranslatable.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="app" translatable="false">Bitmask</string>
+	<string name="app_name" translatable="false">Bitmask</string>
+	
+    <string name="copyright_leapgui" translatable="false">Copyright 2012\nLEAP Encryption Access Project &lt;info@leap.se></string>
+    <string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. &lt;sales@openvpn.net>\n
+
+	  "OpenVPN" is a trademark of OpenVPN Technologies, Inc.</string>
+    <string name="lzo_copyright" translatable="false">Copyright © 1996 – 2011 Markus Franz Xaver Johannes Oberhumer</string>
+    <string name="copyright_openssl" translatable="false">        This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit\n
+        Copyright © 1998-2008 The OpenSSL Project. All rights reserved.\n\n
+        This product includes cryptographic software written by Eric Young (eay@cryptsoft.com)\n
+        Copyright © 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.</string>
+    <string name="openvpn" translatable="false">OpenVPN</string>
+    <string name="lzo" translatable="false">LZO</string>
+    <string name="openssl" translatable="false">OpenSSL</string>
+    <string name="unknown_state" translatable="false">Unknown state</string>
+</resources>
-- 
cgit v1.2.3