From 5ea927f89626cef98495b5fead628cdc01d2a39a Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 12 Jul 2019 13:28:36 +0200
Subject: replace 'Bitmask' in strings with variable for a better client
 customization

---
 app/src/main/res/values/strings.xml | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ba4ef949..551b7cb1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,11 +49,11 @@
   <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="setup_error_text">There was an error configuring %s 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">The server is unreachable, please try again.</string>
   <string name="error.security.pinnedcertificate">Security error, upgrade the app or choose another provider.</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="malformed_url">It doesn\'t seem to be a %s provider.</string>
+  <string name="certificate_error">This is not a trusted %s provider.</string>
   <string name="service_is_down_error">The service is down.</string>
   <string name="configuring_provider">Configuring provider</string>
   <string name="incorrectly_downloaded_certificate_message">Your anonymous certificate was not downloaded</string>
@@ -72,29 +72,20 @@
   <string name="provider_problem">It seems there is a problem with the provider.</string>
   <string name="try_another_provider">Please try another provider, or contact yours.</string>
   <string name="default_username">Anonymous</string>
-  <string name="logged_in_user_status">is logged in.</string>
-  <string name="logged_out_user_status">logged out.</string>
-  <string name="didnt_log_out_user_status">didn\'t log out. Try later, it may be a problem in the network or with the provider. Should it persist, wipe the Bitmask data from the Android settings.</string>
-  <string name="not_logged_in_user_status">have not logged in.</string>
-  <string name="logging_in_user_status">is logging in.</string>
   <string name="logging_in">Logging in</string>
   <string name="signing_up">Signing up</string>
-  <string name="logging_out_user_status">is logging out.</string>
-  <string name="signingup_message">is being registered.</string>
   <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="vpn_securely_routed_no_internet">No internet connection detected, when it comes back we\'ll route your traffic securely through:</string>
-  <string name="bitmask_log">Bitmask Log</string>
-  <string name="title_activity_main">Bitmask</string>
   <string name="log_fragment_title">Log</string>
   <string name="vpn_fragment_title">VPN</string>
   <string name="navigation_drawer_open">Open navigation drawer</string>
   <string name="navigation_drawer_close">Close navigation drawer</string>
   <string name="action_example">Example action</string>
   <string name="action_settings">Settings</string>
-  <string name="void_vpn_establish">Bitmask blocks all outgoing internet traffic.</string>
+  <string name="void_vpn_establish">%s blocks all outgoing internet traffic.</string>
   <string name="void_vpn_error_establish">Failed to establish blocking VPN.</string>
   <string name="void_vpn_stopped">Stopped blocking all outgoing internet traffic.</string>
   <string name="void_vpn_title">Blocking traffic</string>
@@ -102,9 +93,9 @@
   <string name="update_certificate">Update certificate</string>
   <string name="warning_eip_json_corrupted">Updating provider configuration failed.</string>
   <string name="eip_json_corrupted_user_message">Updating provider configuration failed. Please log in to try again.</string>
-  <string name="warning_corrupted_provider_details">Stored provider details are corrupted. You can either update Bitmask (recommended) or update the provider details using a commercial CA certificate.</string>
-  <string name="warning_corrupted_provider_cert">Stored provider certificate is invalid. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.</string>
-  <string name="warning_expired_provider_cert">Stored provider certificate is expired. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.</string>
+  <string name="warning_corrupted_provider_details">Stored provider details are corrupted. You can either update %s (recommended) or update the provider details using a commercial CA certificate.</string>
+  <string name="warning_corrupted_provider_cert">Stored provider certificate is invalid. You can either update %s (recommended) or update the provider certificate using a commercial CA certificate.</string>
+  <string name="warning_expired_provider_cert">Stored provider certificate is expired. You can either update %s (recommended) or update the provider certificate using a commercial CA certificate.</string>
   <string name="downloading_vpn_certificate_failed">Downloading the VPN certificate failed. Try again or choose another provider.</string>
   <string name="vpn_certificate_is_invalid">VPN certificate is invalid. Try to download a new one.</string>
   <string name="vpn_certificate_user_message">The VPN certificate is invalid. Please log in to download a new one.</string>
-- 
cgit v1.2.3