am 300f8299: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev

* commit '300f8299a6085e295e288d535ad3b8fd0ccbb1cf':
  Revised language for notification ringtone picker.
This commit is contained in:
Daniel Sandler
2012-12-04 11:02:18 -08:00
committed by Android Git Automerger

View File

@@ -1660,7 +1660,7 @@
<!-- 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="notification_sound_title">Default notification</string>
<string name="notification_sound_title">Default notification sound</string>
<!-- Sound settings screen, notification light repeat pulsing title -->
<string name="notification_pulse_title">Pulse notification light</string>
<!-- Sound settings screen, the title of the volume bar to adjust the incoming call volume -->
@@ -1671,7 +1671,7 @@
the same as the incoming call volume. -->
<string name="checkbox_notification_same_as_incoming_call">Use incoming call volume for notifications</string>
<!-- Sound settings screen, setting option title-->
<string name="notification_sound_dialog_title">Choose notification ringtone</string>
<string name="notification_sound_dialog_title">Default notification sound</string>
<!-- Sound settings screen, setting option name -->
<string name="media_volume_title">Media</string>
<!-- Sound settings screen, setting option summary text -->