commit bb15f3d14f44eed11f33878bcc94e8f2b3820341
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jul 13 22:13:26 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 13 22:13:27 2016 +0000
tree 935041df80b8f92085828f6d7d94d667e207421b
parent 6d0ed88746e99b48a138bfd74b94360529bdfa82
parent a49178a487822cc34d92d47f2f87b934c22f75f9

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

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 77c9f9a..2722692 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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>
@@ -5919,10 +5919,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>
@@ -5930,7 +5930,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] -->