commit 01a868d73b2c0a8c969a4ad37af0e0a98a9eb156
author Amith Yamasani <yamasani@google.com> Thu Jan 14 16:33:15 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 14 16:33:15 2010 -0800
tree dbf07167193a7bf4f210d69c7becf8afaf6261bf
parent c9b9f650fcbce8ba2ab0b2e60e5334b02b4010e5
parent 237749dd85ae63b44917223327b2b3f8ac8e086d

Merge "Strings for new Dock settings screen, to get started on the L10N." into eclair

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2b49d1d..c459ccc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -905,8 +905,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 -->
@@ -938,6 +936,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-->