Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev

    <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->

    <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->

    <string name="ringtone_default_with_actual">Default ringtone (<xliff:g id="actual_ringtone">%1$s</xliff:g>)</string>

    <string name="ringtone_default_with_actual">Default ringtone (<xliff:g id="actual_ringtone">%1$s</xliff:g>)</string>

    <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->

    <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->

    <string name="ringtone_silent">Silent</string>

    <string name="ringtone_silent">None</string>

    <!-- The title of the ringtone picker dialog. -->

    <!-- The title of the ringtone picker dialog. -->

    <string name="ringtone_picker_title">Ringtones</string>

    <string name="ringtone_picker_title">Ringtones</string>

    <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->

    <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->