Merge branch 'feature/establish-an-upstream-relationship-with-ics-openvpn-codebase-#5381' into develop

1 files changed, 0 insertions, 72 deletions

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ac692a69..d7114b73 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,88 +1,16 @@
 <?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>