Merge \\"Change \\"ringer volume\\" to \\"ring volume\\"\\" into nyc-mr1-dev am: bb15f3d14f

am: 0311342bc8

Change-Id: I23928c43b7fd8a74f8bfc049958fed54658fc24e
This commit is contained in:
Mike Tsao
2016-07-14 00:01:20 +00:00
committed by android-build-merger

View File

@@ -2010,7 +2010,7 @@
<!-- Sound settings screen, music effects title [CHAR LIMIT=30]-->
<string name="musicfx_title">Music effects</string>
<!-- Sound settings screen, setting option name -->
<string name="ring_volume_title">Ringer volume</string>
<string name="ring_volume_title">Ring volume</string>
<!-- Sound settings screen, setting option name checkbox -->
<string name="vibrate_in_silent_title">Vibrate when silent</string>
<!-- Sound settings screen, setting option name -->
@@ -2054,7 +2054,7 @@
<string name="volume_notification_description">Notifications</string>
<!-- Volume description for alarm volume -->
<string name="volume_alarm_description">Alarms</string>
<!-- Image description for ringer volume mute button. -->
<!-- Image description for ring volume mute button. -->
<string name="volume_ring_mute">Mute ringtone &amp; notifications</string>
<!-- Image description for media volume mute button. -->
<string name="volume_media_mute">Mute music &amp; other media</string>
@@ -5921,10 +5921,10 @@
<!-- Sounds and Notification -->
<!-- Sound: Dashboard summary. [CHAR LIMIT=100] -->
<string name="sound_settings_summary">Ringer volume at <xliff:g id="percentage" example="2">%1$s</xliff:g></string>
<string name="sound_settings_summary">Ring volume at <xliff:g id="percentage" example="2">%1$s</xliff:g></string>
<!-- Sound: Dashboard summary example used in Setup Wizard preview screen. [CHAR LIMIT=100] -->
<string name="sound_settings_example_summary">Ringer volume at 80%</string>
<string name="sound_settings_example_summary">Ring volume at 80%</string>
<!-- Sound: Title for the option managing media volume. [CHAR LIMIT=30] -->
<string name="media_volume_option_title">Media volume</string>
@@ -5932,7 +5932,7 @@
<!-- Sound: Title for the option managing alarm volume. [CHAR LIMIT=30] -->
<string name="alarm_volume_option_title">Alarm volume</string>
<!-- Sound: Title for the option managing ringer volume. [CHAR LIMIT=30] -->
<!-- Sound: Title for the option managing ring volume. [CHAR LIMIT=30] -->
<string name="ring_volume_option_title">Ring volume</string>
<!-- Sound: Title for the option managing notification volume. [CHAR LIMIT=30] -->