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

Commit 47688c2e authored by Sanket Padawe's avatar Sanket Padawe Committed by Android (Google) Code Review
Browse files

Merge "String changes for Voice/Data/Emergency service blocked."

parents 778b03ad acc0a448

core/res/res/values/strings.xml

+17 −16
Original line number Diff line number Diff line
@@ -189,22 +189,23 @@ 
    <!-- Displayed to tell the user that they cannot change the caller ID setting. -->

    <string name="CLIRPermanent">You can\'t change the caller ID setting.</string>



    <!-- Displayed to tell the user that data service is blocked by access control. -->

    <string name="RestrictedOnData">Data service is blocked.</string>

    <!-- Displayed to tell the user that emergency service is blocked by access control. -->

    <string name="RestrictedOnEmergency">Emergency service is blocked.</string>

    <!-- Displayed to tell the user that normal service is blocked by access control. -->

    <string name="RestrictedOnNormal">Voice service is blocked.</string>

    <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->

    <string name="RestrictedOnAllVoice">All voice services are blocked.</string>

    <!-- Displayed to tell the user that sms service is blocked by access control. -->

    <string name="RestrictedOnSms">SMS service is blocked.</string>

    <!-- Displayed to tell the user that voice/data service is blocked by access control. -->

    <string name="RestrictedOnVoiceData">Voice/data services are blocked.</string>

    <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->

    <string name="RestrictedOnVoiceSms">Voice/SMS services are blocked.</string>

    <!-- Displayed to tell the user that all service is blocked by access control. -->

    <string name="RestrictedOnAll">All voice/data/SMS services are blocked.</string>

    <!-- Notification title to tell the user that data service is blocked by access control. -->

    <string name="RestrictedOnDataTitle">No data service</string>

    <!-- Notification title to tell the user that emergency service is blocked by access control. -->

    <string name="RestrictedOnEmergencyTitle">No emergency service</string>

    <!-- Notification title to tell the user that normal service is blocked by access control. -->

    <string name="RestrictedOnNormalTitle">No voice service</string>

    <!-- Notification title to tell the user that all emergency and normal voice services are blocked by access control. -->

    <string name="RestrictedOnAllVoiceTitle">No voice/emergency service</string>



    <!-- Notification content to tell the user that data service is blocked by access control. -->

    <string name="RestrictedOnDataContent">Your carrier has temporarily suspended data service at this location</string>

    <!-- Notification content to tell the user that emergency service is blocked by access control. -->

    <string name="RestrictedOnEmergencyContent">Your carrier has temporarily suspended emergency calls at this location</string>

    <!-- Notification content to tell the user that normal service is blocked by access control. -->

    <string name="RestrictedOnNormalContent">Your carrier has temporarily suspended voice calls at this location</string>

    <!-- Notification content to tell the user that all emergency and normal voice services are blocked by access control. -->

    <string name="RestrictedOnAllVoiceContent">Your carrier has temporarily suspended voice and emergency calls at this location</string>



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

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

core/res/res/values/symbols.xml

+8 −4
Original line number Diff line number Diff line
@@ -507,12 +507,16 @@ 
  <java-symbol type="string" name="Noon" />

  <java-symbol type="string" name="PinMmi" />

  <java-symbol type="string" name="PwdMmi" />

  <java-symbol type="string" name="RestrictedOnAllVoice" />

  <java-symbol type="string" name="RestrictedOnData" />

  <java-symbol type="string" name="RestrictedOnEmergency" />

  <java-symbol type="string" name="RestrictedOnNormal" />

  <java-symbol type="string" name="NetworkPreferenceSwitchSummary" />

  <java-symbol type="string" name="NetworkPreferenceSwitchTitle" />

  <java-symbol type="string" name="RestrictedOnAllVoiceTitle" />

  <java-symbol type="string" name="RestrictedOnDataTitle" />

  <java-symbol type="string" name="RestrictedOnEmergencyTitle" />

  <java-symbol type="string" name="RestrictedOnNormalTitle" />

  <java-symbol type="string" name="RestrictedOnAllVoiceContent" />

  <java-symbol type="string" name="RestrictedOnDataContent" />

  <java-symbol type="string" name="RestrictedOnEmergencyContent" />

  <java-symbol type="string" name="RestrictedOnNormalContent" />

  <java-symbol type="string" name="SetupCallDefault" />

  <java-symbol type="string" name="accept" />

  <java-symbol type="string" name="activity_chooser_view_see_all" />