diff options
| author | 2017-11-21 03:34:02 +0000 | |
|---|---|---|
| committer | 2017-11-21 03:34:02 +0000 | |
| commit | d45e1db13bdabe62ff2eb2b35955f7287d8ebb90 (patch) | |
| tree | 67e1bb8be9a734b08528d6389fb8a0b66c399871 | |
| parent | f4ab4b538783f003a2232a6af73fb83c96fa7c38 (diff) | |
| parent | 0cc1c968bb826add02380021b6d05122781871de (diff) | |
Merge "String update: Internet -> internet"
| -rw-r--r-- | core/res/res/values/strings.xml | 8 | ||||
| -rw-r--r-- | packages/SettingsLib/res/values/strings.xml | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 9e0722bc0de0..7a3fa1a7b512 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -152,7 +152,7 @@ <!-- Displayed to tell the user that they should switch their network preference. --> <string name="NetworkPreferenceSwitchTitle">Can\u2019t reach network</string> <!-- Displayed to tell the user that they should switch their network preference. --> - <string name="NetworkPreferenceSwitchSummary">To improve reception, try changing the type selected at Settings > Network & Internet > Mobile networks > Preferred network type."</string> + <string name="NetworkPreferenceSwitchSummary">To improve reception, try changing the type selected at Settings > Network & internet > Mobile networks > Preferred network type."</string> <!-- Displayed to tell the user that emergency calls might not be available. --> <string name="EmergencyCallWarningTitle">Wi\u2011Fi calling is active</string> <!-- Displayed to tell the user that emergency calls might not be available. --> @@ -3014,7 +3014,7 @@ <string name="network_available_sign_in_detailed"><xliff:g id="network_ssid">%1$s</xliff:g></string> <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. --> - <string name="wifi_no_internet">Wi-Fi has no Internet access</string> + <string name="wifi_no_internet">Wi-Fi has no internet access</string> <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. --> <string name="wifi_no_internet_detailed">Tap for options</string> @@ -3023,7 +3023,7 @@ <string name="network_switch_metered">Switched to <xliff:g id="network_type">%1$s</xliff:g></string> <!-- A notification might be shown if the device switches to another network type (e.g., mobile data) because it detects that the network it was using (e.g., Wi-Fi) has lost Internet connectivity. This is the notification's message. %1$s is the network that the device switched to, e.g., cellular data. %2$s is the network type the device switched from, e.g., Wi-Fi. Both are strings in the network_switch_type_name array. --> - <string name="network_switch_metered_detail">Device uses <xliff:g id="new_network">%1$s</xliff:g> when <xliff:g id="previous_network">%2$s</xliff:g> has no Internet access. Charges may apply.</string> + <string name="network_switch_metered_detail">Device uses <xliff:g id="new_network">%1$s</xliff:g> when <xliff:g id="previous_network">%2$s</xliff:g> has no internet access. Charges may apply.</string> <!-- A toast might be shown if the device switches to another network type (e.g., mobile data) because it detects that the network it was using (e.g., Wi-Fi) has lost Internet connectivity. This is the text of the toast. %1$s is the network that the device switched from, e.g., Wi-Fi. %2$s is the network type the device switched from, e.g., cellular data. Both are strings in the network_switch_type_name array. --> <string name="network_switch_metered_toast">Switched from <xliff:g id="previous_network">%1$s</xliff:g> to <xliff:g id="new_network">%2$s</xliff:g></string> @@ -3043,7 +3043,7 @@ <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems. This is the notification's title / ticker. --> <string name="wifi_watchdog_network_disabled">Couldn\'t connect to Wi-Fi</string> <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems. The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" --> - <string name="wifi_watchdog_network_disabled_detailed">\u0020has a poor Internet connection.</string> + <string name="wifi_watchdog_network_disabled_detailed">\u0020has a poor internet connection.</string> <!-- Do not translate. Default access point SSID used for tethering --> <string name="wifi_tether_configure_ssid_default" translatable="false">AndroidAP</string> diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 26fd75057885..d82db410e70e 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -77,7 +77,7 @@ <!-- Summary for the network but no internet connection was detected. --> <string name="wifi_no_internet_no_reconnect">Won\'t automatically connect</string> <!-- Summary for the remembered network but no internet connection was detected. --> - <string name="wifi_no_internet">No Internet access</string> + <string name="wifi_no_internet">No internet access</string> <!-- Summary for saved networks --> <string name="saved_network">Saved by <xliff:g id="name">%1$s</xliff:g></string> @@ -95,7 +95,7 @@ <string name="certinstaller_package" translatable="false">com.android.certinstaller</string> <!-- Summary for Connected wifi network without internet --> - <string name="wifi_connected_no_internet">Connected, no Internet</string> + <string name="wifi_connected_no_internet">Connected, no internet</string> <!-- Summary for networks failing to connect due to association rejection status 17, AP full --> <string name="wifi_ap_unable_to_handle_new_sta">Access point temporarily full</string> @@ -192,14 +192,14 @@ <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. --> <string name="bluetooth_hid_profile_summary_connected">Connected to input device</string> <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]--> - <string name="bluetooth_pan_user_profile_summary_connected">Connected to device for Internet access</string> + <string name="bluetooth_pan_user_profile_summary_connected">Connected to device for internet access</string> <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]--> - <string name="bluetooth_pan_nap_profile_summary_connected">Sharing local Internet connection with device</string> + <string name="bluetooth_pan_nap_profile_summary_connected">Sharing local internet connection with device</string> <!-- Bluetooth settings. Connection options screen. The summary for the PAN checkbox preference that describes how checking it will set the PAN profile as preferred. --> - <string name="bluetooth_pan_profile_summary_use_for">Use for Internet access</string> + <string name="bluetooth_pan_profile_summary_use_for">Use for internet access</string> <!-- Bluetooth settings. Connection options screen. The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. --> <string name="bluetooth_map_profile_summary_use_for">Use for map</string> <!-- Bluetooth settings. Connection options screen. The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. --> |