Merge "rename emergency tone settings"

am: 2054a4d6d4

Change-Id: I106fc98ae0dab79e5e8bc9b5ec10c3810a440aaa
This commit is contained in:
Chen Xu
2018-02-28 02:38:23 +00:00
committed by android-build-merger

View File

@@ -5230,7 +5230,7 @@ The variable will be replaced with a number. -->
<string name="usage_access_title">Apps with usage access</string> <string name="usage_access_title">Apps with usage access</string>
<!-- Sound settings screen, setting check box label --> <!-- 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 --> <!-- Sound settings screen, setting option summary text -->
<string name="emergency_tone_summary">Set behavior when an emergency call is placed</string> <string name="emergency_tone_summary">Set behavior when an emergency call is placed</string>
@@ -6682,14 +6682,14 @@ The variable will be replaced with a number. -->
<!-- Sound: Other sounds: Value for the dock audio media with value 1: enabled. [CHAR LIMIT=30] --> <!-- 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> <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] --> <!-- Sound: Other sounds: Value for the emergency dialing signal option with value 0: silence. [CHAR LIMIT=30] -->
<string name="emergency_tone_silent">Silent</string> <string name="emergency_tone_silent">Silence</string>
<!-- Sound: Other sounds: Value for the emergency tone option with value 1: alert. [CHAR LIMIT=30] --> <!-- Sound: Other sounds: Value for the emergency dialing signal option with value 1: tones. [CHAR LIMIT=30] -->
<string name="emergency_tone_alert">Alert</string> <string name="emergency_tone_alert">Tones</string>
<!-- Sound: Other sounds: Value for the emergency tone option with value 2: vibrate. [CHAR LIMIT=30] --> <!-- Sound: Other sounds: Value for the emergency dialing signal option with value 2: vibrations. [CHAR LIMIT=30] -->
<string name="emergency_tone_vibrate">Vibrate</string> <string name="emergency_tone_vibrate">Vibrations</string>
<!-- Sound: Other sounds: Title for the option enabling boot sounds. [CHAR LIMIT=30] --> <!-- Sound: Other sounds: Title for the option enabling boot sounds. [CHAR LIMIT=30] -->
<string name="boot_sounds_title">Power on sounds</string> <string name="boot_sounds_title">Power on sounds</string>