Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a0b9d43 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update string from cellular to mobile."

parents 52b6bde4 538ec83a

core/res/res/values/strings.xml

+12 −13
Original line number Original line Diff line number Diff line
@@ -209,8 +209,7 @@ 
    <!-- Displayed to tell the user that they should switch their network preference. -->

    <!-- Displayed to tell the user that they should switch their network preference. -->

    <string name="NetworkPreferenceSwitchTitle">Can\u2019t reach network</string>

    <string name="NetworkPreferenceSwitchTitle">Can\u2019t reach network</string>

    <!-- Displayed to tell the user that they should switch their network preference. -->

    <!-- 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 > Cellular networks > Preferred network type."</string>

    <string name="NetworkPreferenceSwitchSummary">To improve reception, try changing the type selected at System &gt; Network &amp; Internet &gt; Mobile networks &gt; Preferred network type."</string>







    <!-- Displayed to tell the user that peer changed TTY mode -->

    <!-- Displayed to tell the user that peer changed TTY mode -->

    <string name="peerTtyModeFull">Peer requested TTY Mode FULL</string>

    <string name="peerTtyModeFull">Peer requested TTY Mode FULL</string>
@@ -263,7 +262,7 @@ 
    <string-array name="wfcOperatorErrorNotificationMessages">

    <string-array name="wfcOperatorErrorNotificationMessages">

        <item>Register with your carrier</item>

        <item>Register with your carrier</item>

    </string-array>

    </string-array>

    <!-- Template for showing cellular network operator name while WFC is active -->

    <!-- Template for showing mobile network operator name while WFC is active -->

    <string-array name="wfcSpnFormats">

    <string-array name="wfcSpnFormats">

        <item>%s</item>

        <item>%s</item>

        <item>%s Wi-Fi Calling</item>

        <item>%s Wi-Fi Calling</item>
@@ -272,8 +271,8 @@ 
    <string name="wifi_calling_off_summary">Off</string>

    <string name="wifi_calling_off_summary">Off</string>

    <!-- WFC, summary for Wi-Fi Preferred -->

    <!-- WFC, summary for Wi-Fi Preferred -->

    <string name="wfc_mode_wifi_preferred_summary">Wi-Fi preferred</string>

    <string name="wfc_mode_wifi_preferred_summary">Wi-Fi preferred</string>

    <!-- WFC, summary for Cellular Preferred -->

    <!-- WFC, summary for Mobile data Preferred -->

    <string name="wfc_mode_cellular_preferred_summary">Cellular preferred</string>

    <string name="wfc_mode_cellular_preferred_summary">Mobile preferred</string>

    <!-- WFC, summary for Wi-Fi Only -->

    <!-- WFC, summary for Wi-Fi Only -->

    <string name="wfc_mode_wifi_only_summary">Wi-Fi only</string>

    <string name="wfc_mode_wifi_only_summary">Wi-Fi only</string>
@@ -2972,18 +2971,18 @@ 
    <!-- 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. -->

    <!-- 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>

    <string name="wifi_no_internet_detailed">Tap for options</string>





    <!-- A notification might be shown if the device switches to another network type (e.g., cellular data) because it detects that the network it was using (e.g., Wi-Fi) has lost Internet connectivity. This is the notification's title. %1$s is the network type that the device switched to, e.g., cellular data. It is one of the strings in the network_switch_type_name array. -->

    <!-- 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 title. %1$s is the network type that the device switched to, e.g., cellular data. It is one of the strings in the network_switch_type_name array. -->

    <string name="network_switch_metered">Switched to <xliff:g id="network_type">%1$s</xliff:g></string>

    <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., cellular 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. -->

    <!-- 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., cellular 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. -->

    <!-- 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>

    <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>





    <!-- Network type names used in the network_switch_metered and network_switch_metered_detail strings. These must be kept in the sync with the values NetworkCapabilities.TRANSPORT_xxx values, and in the same order. -->

    <!-- Network type names used in the network_switch_metered and network_switch_metered_detail strings. These must be kept in the sync with the values NetworkCapabilities.TRANSPORT_xxx values, and in the same order. -->

    <string-array name="network_switch_type_name">

    <string-array name="network_switch_type_name">

        <item>cellular data</item>

        <item>mobile data</item>

        <item>Wi-Fi</item>

        <item>Wi-Fi</item>

        <item>Bluetooth</item>

        <item>Bluetooth</item>

        <item>Ethernet</item>

        <item>Ethernet</item>
@@ -3067,13 +3066,13 @@ 
    <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->

    <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->

    <string name="sim_removed_title">SIM card removed</string>

    <string name="sim_removed_title">SIM card removed</string>

    <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->

    <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->

    <string name="sim_removed_message">The cellular network will be unavailable until you restart with a valid SIM card inserted.</string>

    <string name="sim_removed_message">The mobile network will be unavailable until you restart with a valid SIM card inserted.</string>

    <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->

    <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->

    <string name="sim_done_button">Done</string>

    <string name="sim_done_button">Done</string>

    <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->

    <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->

    <string name="sim_added_title">SIM card added</string>

    <string name="sim_added_title">SIM card added</string>

    <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->

    <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->

    <string name="sim_added_message">Restart your device to access the cellular network.</string>

    <string name="sim_added_message">Restart your device to access the mobile network.</string>

    <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->

    <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->

    <string name="sim_restart_button">Restart</string>

    <string name="sim_restart_button">Restart</string>

    <!-- See Carrier_App_Dialog. This is the message of that dialog. -->

    <!-- See Carrier_App_Dialog. This is the message of that dialog. -->
@@ -3628,7 +3627,7 @@ 
    <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->

    <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->

    <string name="data_usage_4g_limit_title">4G data limit reached</string>

    <string name="data_usage_4g_limit_title">4G data limit reached</string>

    <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->

    <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->

    <string name="data_usage_mobile_limit_title">Cellular data limit reached</string>

    <string name="data_usage_mobile_limit_title">Mobile data limit reached</string>

    <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->

    <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->

    <string name="data_usage_wifi_limit_title">Wi-Fi data limit reached</string>

    <string name="data_usage_wifi_limit_title">Wi-Fi data limit reached</string>

    <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. -->

    <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. -->
@@ -3639,7 +3638,7 @@ 
    <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->

    <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->

    <string name="data_usage_4g_limit_snoozed_title">4G data limit exceeded</string>

    <string name="data_usage_4g_limit_snoozed_title">4G data limit exceeded</string>

    <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->

    <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->

    <string name="data_usage_mobile_limit_snoozed_title">Cellular data limit exceeded</string>

    <string name="data_usage_mobile_limit_snoozed_title">Mobile data limit exceeded</string>

    <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->

    <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->

    <string name="data_usage_wifi_limit_snoozed_title">Wi-Fi data limit exceeded</string>

    <string name="data_usage_wifi_limit_snoozed_title">Wi-Fi data limit exceeded</string>

    <!-- Notification body when data usage has exceeded limit threshold. -->

    <!-- Notification body when data usage has exceeded limit threshold. -->