commit 6a6cc310cf0b8067683fdcd38ac524370e09ec65
author Chen Xu <fionaxu@google.com> Wed Feb 28 02:49:11 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 28 02:49:11 2018 +0000
tree b78c2d5421b36beedc7bb183e3b25e2830ebda98
parent 26ea60a2316a5f3c2549af53392f271881bb990f
parent 648d302ba74bb9174cd85aca41a2376734b49660

Merge "rename emergency tone settings" am: 2054a4d6d4 am: eb664426c5
am: 648d302ba7

Change-Id: I5edb5cf7b20b022b2a2514ec96bf99e38cf2c007

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 46a15c1..e7c7bba 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5410,7 +5410,7 @@
     <string name="usage_access_title">Apps with usage access</string>
 
     <!-- Sound settings screen, setting check box label -->
-    <string name="emergency_tone_title">Emergency tone</string>
+    <string name="emergency_tone_title">Emergency dialing signal</string>
     <!-- Sound settings screen, setting option summary text -->
     <string name="emergency_tone_summary">Set behavior when an emergency call is placed</string>
 
@@ -6868,14 +6868,14 @@
     <!-- Sound: Other sounds: Value for the dock audio media with value 1: enabled. [CHAR LIMIT=30] -->
     <string name="dock_audio_media_enabled">Media audio only</string>
 
-    <!-- Sound: Other sounds: Value for the emergency tone option with value 0: silent. [CHAR LIMIT=30] -->
-    <string name="emergency_tone_silent">Silent</string>
+    <!-- Sound: Other sounds: Value for the emergency dialing signal option with value 0: silence. [CHAR LIMIT=30] -->
+    <string name="emergency_tone_silent">Silence</string>
 
-    <!-- Sound: Other sounds: Value for the emergency tone option with value 1: alert. [CHAR LIMIT=30] -->
-    <string name="emergency_tone_alert">Alert</string>
+    <!-- Sound: Other sounds: Value for the emergency dialing signal option with value 1: tones. [CHAR LIMIT=30] -->
+    <string name="emergency_tone_alert">Tones</string>
 
-    <!-- Sound: Other sounds: Value for the emergency tone option with value 2: vibrate. [CHAR LIMIT=30] -->
-    <string name="emergency_tone_vibrate">Vibrate</string>
+    <!-- Sound: Other sounds: Value for the emergency dialing signal option with value 2: vibrations. [CHAR LIMIT=30] -->
+    <string name="emergency_tone_vibrate">Vibrations</string>
 
     <!-- Sound: Other sounds: Title for the option enabling boot sounds. [CHAR LIMIT=30] -->
     <string name="boot_sounds_title">Power on sounds</string>