diff options
| author | Amith Yamasani <yamasani@google.com> | 2010-01-14 17:04:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-14 17:04:45 -0800 |
| commit | 3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df (patch) | |
| tree | 37126e2782239e685a9127d9b14b9a88b2ecbc4c | |
| parent | 49efbf8b5b7a6817a4a1020982cb34f4ca226d48 (diff) | |
| parent | 01a868d73b2c0a8c969a4ad37af0e0a98a9eb156 (diff) | |
| download | packages_apps_settings-3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df.zip packages_apps_settings-3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df.tar.gz packages_apps_settings-3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df.tar.bz2 | |
am 01a868d7: Merge "Strings for new Dock settings screen, to get started on the L10N." into eclair
Merge commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156' into eclair-plus-aosp
* commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156':
Strings for new Dock settings screen, to get started on the L10N.
| -rw-r--r-- | res/values/strings.xml | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index a32a3ee..cb1a08d 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 & sync</string> <!-- Main Settings screen setting option summary text for the itme to go into the screen with data sync settings--> |