diff options
| author | Michael Chan <mchan@android.com> | 2009-12-03 20:44:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-03 20:44:45 -0800 |
| commit | 2ffa95fd591424ae87337078ead9693b716a9873 (patch) | |
| tree | dc94d06dfc70f77bc904f88060c7ae06ec1f9b35 /res/values | |
| parent | 87985ae6de00f4001f957d7a27004843872a7e2a (diff) | |
| parent | 0bd445b974292dc3910b6bb85dcee7e7c378968f (diff) | |
| download | packages_apps_settings-2ffa95fd591424ae87337078ead9693b716a9873.zip packages_apps_settings-2ffa95fd591424ae87337078ead9693b716a9873.tar.gz packages_apps_settings-2ffa95fd591424ae87337078ead9693b716a9873.tar.bz2 | |
am 0bd445b9: b/2296110 New Dialog which appears when phone is place on dock.
Merge commit '0bd445b974292dc3910b6bb85dcee7e7c378968f' into eclair-mr2
* commit '0bd445b974292dc3910b6bb85dcee7e7c378968f':
b/2296110 New Dialog which appears when phone is place on dock.
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index a4b4901..3c6264c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -631,6 +631,19 @@ <!-- Bluetooth settings. Connection options screen. The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. --> <string name="bluetooth_opp_profile_summary_use_for">Use for file transfer</string> + <!-- Bluetooth settings. Dock Setting Title --> + <string name="bluetooth_dock_settings">Dock Settings</string> + <!-- Bluetooth settings. Dock Setting Dialog Title --> + <string name="bluetooth_dock_settings_title">Use dock for audio</string> + <!-- Bluetooth settings. Dock Setting Dialog - Checkbox selection 1: Use dock as speaker phone --> + <string name="bluetooth_dock_settings_headset">As speaker phone</string> + <!-- Bluetooth settings. Dock Setting Dialog - Checkbox selection 2: Use dock for media audio --> + <string name="bluetooth_dock_settings_a2dp">For music and media</string> + <!-- Bluetooth settings. Dock Setting Dialog - Remember setting and don't ask user again --> + <string name="bluetooth_dock_settings_remember">Remember settings</string> + <!-- Bluetooth settings. Dock Setting Dialog - Hint for the user to chagne setting after checking "remember settings" --> + <string name="bluetooth_dock_settings_hint">"Change with Settings under Sound & display > Dock audio</string> + <!-- Wi-Fi settings --> <!-- Used in the 2nd-level settings screen to turn on Wi-Fi --> <string name="wifi">Wi-Fi</string> @@ -883,7 +896,9 @@ <!-- 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 settings</string> + <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 --> <string name="dtmf_tone_enable_title">Audible touch tones</string> <!-- Sound settings screen, setting option summary text when check box is selected --> |