am 3b7ffa5e: am 01a868d7: Merge "Strings for new Dock settings screen, to get started on the L10N." into eclair

Merge commit '3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df'

* commit '3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df':
  Strings for new Dock settings screen, to get started on the L10N.
This commit is contained in:
Amith Yamasani
2010-01-20 14:36:08 -08:00
committed by Android Git Automerger

View File

@@ -999,8 +999,6 @@
<string name="media_volume_title">Media volume</string>
<!-- Sound settings screen, setting option summary text -->
<string name="media_volume_summary">Set volume for music and videos</string>
<!-- Sound settings screen, dock settings -->
<string name="dock_settings_title">Dock audio</string>
<!-- Sound settings screen, dock settings summary-->
<string name="dock_settings_summary">Audio settings for the attached dock</string>
<!-- Sound settings screen, setting check box label -->
@@ -1032,6 +1030,25 @@
<!-- Sound settings screen, setting option summary text -->
<string name="audio_record_proc_summary">Suppress background noise when speaking or recording.</string>
<!-- Dock settings title, top level -->
<string name="dock_settings">Dock</string>
<!-- Dock settings title -->
<string name="dock_settings_title">Dock settings</string>
<!-- Dock audio settings -->
<string name="dock_audio_settings_title">Audio</string>
<!-- Dock audio summary for docked to desk dock -->
<string name="dock_audio_summary_desk">Settings for the attached desktop dock</string>
<!-- Dock audio summary for docked to car dock -->
<string name="dock_audio_summary_car">Settings for the attached car dock</string>
<!-- Dock audio summary for undocked -->
<string name="dock_audio_summary_none">Phone not docked</string>
<!-- Dock audio summary for docked to unknown -->
<string name="dock_audio_summary_unknown">Settings for the attached dock</string>
<!-- Dock not found dialog title -->
<string name="dock_not_found_title">Dock not found</string>
<!-- Dock not found dialog text -->
<string name="dock_not_found_text">You must dock the phone to configure audio settings for that dock</string>
<!-- Acounts & Sync settings screen setting option name to go into the screen for data sync settings-->
<string name="sync_settings">Accounts &amp; sync</string>
<!-- Main Settings screen setting option summary text for the itme to go into the screen with data sync settings-->