diff options
| author | 2017-03-28 18:38:35 +0000 | |
|---|---|---|
| committer | 2017-03-28 18:38:40 +0000 | |
| commit | d3122324a7aa7a156772821b834ef4bcd49c2d8d (patch) | |
| tree | 942c166a4ee813c79085b9cb7b077db2427ae1c0 | |
| parent | 026a558ab0d9e710f385ea658687f385312b970e (diff) | |
| parent | 58047761d8d26dc7fbcb929d992a7f7d5a280c69 (diff) | |
Merge "String changes for Voice/Data/Emergency service blocked." into oc-dev
| -rw-r--r-- | core/res/res/values/strings.xml | 33 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 12 |
2 files changed, 25 insertions, 20 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 868e256496bb..4afa8dcdfb4a 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -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> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index b23c96c9b05f..3c4d7820fbbe 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -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" /> |