Merge "Removed Wi-Fi icon from Saved Networks." into lmp-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 760f4a5..917adbb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1307,7 +1307,7 @@
<!-- Bluetooth settings. Dock Setting Dialog - Remember setting and don't ask user again -->
<string name="bluetooth_dock_settings_remember">Remember settings</string>
- <!-- Wifi Assistant title string. [CHAR LIMIT=20] -->
+ <!-- Wifi Assistant title string. [CHAR LIMIT=40] -->
<string name="wifi_assistant_intro_setup">Introducing\nWi\u2011Fi Assistant</string>
<!-- Wifi Assistant No, thanks string. Text to say no to wifi assistant. [CHAR LIMIT=20] -->
<string name="wifi_assistant_no_thanks">NO, THANKS</string>
@@ -1339,7 +1339,7 @@
<string name="wifi_assistant_deny">DENY</string>
<!-- Wifi Assistant Network Monitoring titile. [CHAR LIMIT=40] -->
<string name="wifi_assistant_network_title">Network monitoring</string>
- <!-- Wifi Assistant permission accepted message. [CHAR LIMIT=100] -->
+ <!-- Wifi Assistant permission accepted message. [CHAR LIMIT=140] -->
<string name="wifi_assistant_permission_accepted">You gave “Google Wi\u2011Fi Assistant” permission to set up a VPN connection. That means this app can monitor network traffic.</string>
<!-- Wifi Assistant open app button text. [CHAR LIMIT=40] -->
<string name="wifi_assistant_open_app">OPEN APP</string>
@@ -1795,7 +1795,7 @@
<string name="wifi_tether_checkbox_text">Portable Wi\u2011Fi hotspot</string>
<!-- Label for Wifi tether checkbox. Toggles Access Point on/off [CHAR LIMIT=30] -->
<string name="wifi_hotspot_checkbox_text">Wi\u2011Fi hotspot</string>
- <!-- Label for Wifi tether checkbox summary. Toggles Access Point on/off [CHAR LIMIT=40] -->
+ <!-- Label for Wifi tether checkbox summary. Toggles Access Point on/off [CHAR LIMIT=60] -->
<string name="wifi_hotspot_checkbox_text_summary">Use cellular connection to provide Wi\u2011Fi network</string>
<!-- Summary text when turning hotspot on -->
<string name="wifi_tether_starting">Turning hotspot on\u2026</string>
@@ -1809,7 +1809,7 @@
<string name="wifi_tether_configure_ap_text">Set up Wi\u2011Fi hotspot</string>
<!-- Used to open the ssid and security dialog for Wifi Access Point. [CHAR LIMIT=30]-->
<string name="wifi_hotspot_configure_ap_text">Wi\u2011Fi hotspot setup</string>
- <!-- Summary Used to open the ssid and security dialog for Wifi Access Point. [CHAR LIMIT=40] -->
+ <!-- Summary Used to open the ssid and security dialog for Wifi Access Point. [CHAR LIMIT=60] -->
<string name="wifi_hotspot_configure_ap_text_summary">AndroidAP WPA2 PSK portable Wi\u2011Fi hotspot</string>
<!-- Subtext on configuration preference to indicate SSID and security chosen -->
<string name="wifi_tether_configure_subtext"><xliff:g id="network_ssid">%1$s</xliff:g> <xliff:g id="network_security">%2$s</xliff:g> portable Wi\u2011Fi hotspot</string>
@@ -4607,9 +4607,7 @@
<!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
<string name="really_remove_account_message" product="default">Removing this account will delete all of its messages, contacts, and other data from the phone!</string>
<!-- This is shown if the autheticator for a given account fails to remove it. -->
- <string name="remove_account_failed" product="tablet">This account is required by some apps. You can only remove it by resetting the tablet to factory defaults (which deletes all your personal data) in Settings > Backup & reset.</string>
- <!-- This is shown if the autheticator for a given account fails to remove it. -->
- <string name="remove_account_failed" product="default">This account is required by some apps. You can only remove it by resetting the phone to factory defaults (which deletes all your personal data) in Settings > Backup & reset.</string>
+ <string name="remove_account_failed">This change isn\'t allowed by your administrator</string>
<!-- What to show in messaging that refers to this provider, e.g. AccountSyncSettings -->
<string name="provider_label">Push subscriptions</string>
<!-- Formatter in AccountSyncSettings for each application we wish to synchronize, e.g. "Sync Calendar" -->
@@ -5444,7 +5442,7 @@
<string name="sim_cellular_data_unavailable">Cellular data is unavailable</string>
<!-- Message summary that Cellular data is unavailable. [CHAR LIMIT=60] -->
<string name="sim_cellular_data_unavailable_summary">Touch to select a data SIM</string>
- <!-- Checkbox to always use for calles. [CHAR LIMIT=40] -->
+ <!-- Checkbox to always use for calls. [CHAR LIMIT=40] -->
<string name="sim_calls_always_use">Always use this for calls</string>
<!-- Title for selecting a SIM card. [CHAR LIMIT=40] -->
<string name="sim_select_card">Select a SIM card</string>