Merge branch 'update-custom-dns-warning-regarding-lan-sharing-text-droid-1346'convert

1 files changed, 1 insertions, 25 deletions

diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml
index 964ad4c3f2..bac4cc8b17 100644
--- a/android/lib/resource/src/main/res/values/strings.xml
+++ b/android/lib/resource/src/main/res/values/strings.xml
@@ -22,7 +22,6 @@
     <string name="create_new_account_warning_paragraph2">Do you want to create a new account?</string>
     <string name="creating_new_account">Creating account...</string>
     <string name="failed_to_create_account">Failed to create account</string>
-    <string name="account_created">Account created</string>
     <string name="congrats">Congrats!</string>
     <string name="here_is_your_account_number">Here’s your account number. Save it!</string>
     <string name="pay_to_start_using">To start using the app, you first need to add time to your account.</string>
@@ -39,15 +38,12 @@
     <string name="no_internet_connection">No internet connection</string>
     <string name="settings_account">Account</string>
     <string name="less_than_a_day_left">less than a day left</string>
-    <string name="less_than_a_minute_ago">less than a minute ago</string>
     <string name="account_credit_expires_in_a_few_minutes">Account credit expires in a few minutes</string>
     <string name="account_credit_has_expired">You have no more VPN time left on this account.</string>
     <string name="out_of_time">Out of time</string>
     <string name="add_time_to_account">Either buy credit on our website or redeem a voucher.</string>
-    <string name="settings_preferences">Preferences</string>
     <string name="settings_vpn">VPN settings</string>
     <string name="app_version">App version</string>
-    <string name="update_available_footer">Update available, download to remain safe.</string>
     <string name="report_a_problem">Report a problem</string>
     <string name="faqs_and_guides">FAQs &amp; Guides</string>
     <string name="privacy_policy_label">Privacy policy</string>
@@ -67,17 +63,13 @@
     <string name="device_name_info_first_paragraph">This is the name assigned to the device. Each device logged in on a Mullvad account gets a unique name that helps you identify it when you manage your devices in the app or on the website.</string>
     <string name="device_name_info_second_paragraph">You can have up to 5 devices logged in on one Mullvad account.</string>
     <string name="device_name_info_third_paragraph">If you log out, the device and the device name is removed. When you log back in again, the device will get a new name.</string>
-    <string name="mullvad_account_number">Mullvad account number</string>
     <string name="copied_mullvad_account_number">Copied Mullvad account number to clipboard</string>
     <string name="paid_until">Paid until</string>
     <string name="log_out">Log out</string>
     <string name="local_network_sharing">Local network sharing</string>
-    <string name="allow_lan_footer">Allows access to other devices on the same network for sharing, printing etc.</string>
-    <string name="auto_connect">Auto-connect</string>
     <string name="auto_connect_and_lockdown_mode">Auto-connect &amp; Lockdown mode</string>
     <string name="auto_connect_and_lockdown_mode_footer">Makes sure the device is always on the VPN tunnel.</string>
     <string name="go_to_vpn_settings">Go to VPN settings</string>
-    <string name="vpn_settings_not_found">There is no VPN settings on your device</string>
     <string name="auto_connect_carousel_first_slide_top_text">The Auto-connect and Lockdown mode settings can be found in the Android system settings, follow this guide to enable one or both.</string>
     <string name="auto_connect_carousel_first_slide_bottom_text">
         <![CDATA[1. After clicking on the \"Go to VPN settings\" button below, click on the cogwheel next to the \"Mullvad VPN\" name.]]>
@@ -93,7 +85,6 @@
     <string name="auto_connect_carousel_third_slide_bottom_text">
         <![CDATA[3. To enable Lockdown mode, click on the toggle next to \"Block connections without VPN\".<br /><br /><b>Warning: This setting blocks split apps and the Local Network Sharing feature.</b>]]>
     </string>
-    <string name="auto_connect_footer_legacy_tv">Automatically connect when the app launches. This setting will be replaced with a new connect on device start-up feature in a future update.</string>
     <string name="wireguard_mtu">WireGuard MTU</string>
     <string name="wireguard_mtu_footer">Set WireGuard MTU value. Valid range: %1$d - %2$d.</string>
     <string name="hint_default">Default</string>
@@ -125,11 +116,8 @@
     <string name="switch_location">Switch location</string>
     <string name="tcp">TCP</string>
     <string name="udp">UDP</string>
-    <string name="in_address">In</string>
-    <string name="out_address">Out</string>
     <string name="blocking_internet">Blocking internet</string>
     <string name="blocking_internet_device_offline">Blocking internet (device offline)</string>
-    <string name="not_blocking_internet">YOU MIGHT BE LEAKING NETWORK TRAFFIC</string>
     <string name="invalid_dns_servers">Custom DNS server addresses %1$s are invalid</string>
     <string name="failed_to_block_internet">Unable to block all network traffic. Please troubleshoot or send a problem report.</string>
     <string name="auth_failed">Unable to authenticate account. Please send a problem report.</string>
@@ -143,24 +131,20 @@
     <string name="custom_dns_hint">Enter IP</string>
     <string name="custom_tunnel_host_resolution_error">Unable to resolve host of custom tunnel. Try changing your settings.</string>
     <string name="is_offline">Your device is offline. The tunnel will automatically connect once your device is back online.</string>
-    <string name="virtual_adapter_problem">Virtual adapter error</string>
     <string name="unsupported_version">UNSUPPORTED VERSION</string>
     <string name="unsupported_version_description">Your privacy might be at risk with this unsupported app version. Please update now.</string>
-    <string name="unsupported_version_without_upgrade">You are running an unsupported app version.</string>
     <string name="account_credit_expires_soon">Account credit expires soon</string>
     <string name="select_location">Select location</string>
     <string name="filter">Filter</string>
-    <string name="select_location_description">While connected, your real location is masked with a private and secure location in the selected region.</string>
     <string name="split_tunneling_description">Lets you select apps that should access the Internet directly without going through the VPN tunnel.</string>
     <string name="split_tunneling_description_warning">Attention: If \"Block connections without VPN\" is enabled, split apps will not have Internet. Always keep in mind that split tunneling is a privacy risk.</string>
     <string name="enable">Enable</string>
     <string name="enable_custom_dns">Use custom DNS server</string>
     <string name="add_a_server">Add a server</string>
     <string name="custom_dns_footer">Enable to add at least one DNS server.</string>
-    <string name="confirm_local_dns">The local DNS server will not work unless you enable \"Local Network Sharing\" under Preferences.</string>
+    <string name="confirm_local_dns">The local DNS server will not work unless you enable \"Local Network Sharing\" under VPN settings.</string>
     <string name="exclude_applications">Excluded applications</string>
     <string name="all_applications">All applications</string>
-    <string name="copied_to_clipboard">Copied to clipboard</string>
     <string name="show_system_apps">Show system apps</string>
     <string name="toggle_vpn">Toggle VPN</string>
     <string name="go_to_login">Go to login</string>
@@ -179,7 +163,6 @@
     <string name="failed_to_fetch_devices">Failed to fetch list of devices</string>
     <string name="copy_account_number">Copy account number</string>
     <string name="hide_account_number">Hide account number</string>
-    <string name="show_account_number">Show account number</string>
     <string name="failed_to_remove_device">Failed to remove device</string>
     <string name="changes_dialog_subtitle">Changes in this version:</string>
     <string name="always_on_vpn_error_notification_title">Always-on VPN assigned to other app</string>
@@ -227,10 +210,8 @@
     <string name="manage_account">Manage account</string>
     <string name="obfuscation_title">WireGuard obfuscation</string>
     <string name="obfuscation_info">Obfuscation hides the WireGuard traffic inside another protocol. It can be used to help circumvent censorship and other types of filtering, where a plain WireGuard connect would be blocked.</string>
-    <string name="obfuscation_on_udp_over_tcp">On (UDP-over-TCP)</string>
     <string name="automatic">Automatic</string>
     <string name="off">Off</string>
-    <string name="udp_over_tcp_port_title">UDP-over-TCP port</string>
     <string name="udp_over_tcp_port_info">Which TCP port the UDP-over-TCP obfuscation protocol should connect to on the VPN server.</string>
     <string name="created_x">Created: %s</string>
     <string name="local_network_sharing_info">This feature allows access to other devices on the local network, such as for sharing, printing, streaming, etc.</string>
@@ -277,9 +258,6 @@
     <string name="loading_verifying">Verifying purchase...</string>
     <string name="copied_logs_to_clipboard">Copied logs to clipboard</string>
     <string name="auto_connect_legacy">Auto-connect (legacy)</string>
-    <string name="auto_connect_footer_legacy">
-        <![CDATA[Please use the \"Always-on\" system setting instead by following the guide in \"%s\" above.]]>
-    </string>
     <string name="custom_lists">Custom lists</string>
     <string name="all_locations">All locations</string>
     <string name="edit_lists">Edit lists</string>
@@ -363,7 +341,6 @@
     <string name="authentication">Authentication</string>
     <string name="username">Username</string>
     <string name="password">Password</string>
-    <string name="transport_protocol">Transport protocol</string>
     <string name="test_method">Test method</string>
     <string name="api_reachable">API reachable</string>
     <string name="api_unreachable">API unreachable</string>
@@ -385,7 +362,6 @@
     <string name="create_custom_list_message">\"%s\" was created</string>
     <string name="daita_info">%s (%s) hides patterns in your encrypted VPN traffic. If anyone is monitoring your connection, this makes it significantly harder for them to identify what websites you are visiting. It does this by carefully adding network noise and making all network packets the same size.</string>
     <string name="daita_warning">Attention: Since this increases your total network traffic, be cautious if you have a limited data plan. It can also negatively impact your network speed and battery usage.</string>
-    <string name="connected_using_daita">%s using %s</string>
     <string name="setting_chip">Setting: %s</string>
     <string name="enable_anyway">Enable anyway</string>
     <string name="daita_relay_subset_warning">This feature isn’t available on all servers. You might need to change location after enabling.</string>