Merge "Change "ringer volume" to "ring volume"" into nyc-mr1-dev

    <!-- 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 -->

    <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>

    <!-- 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>

    <!-- 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] -->