summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorkevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-30 16:41:59 +0000
committerkevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-30 16:41:59 +0000
commitff70f7016825ed45ce244fb9db33d78f1c45f366 (patch)
treee1c0bf9b3210ddb02ac4ebbf6c61f32c673d9c3b /chrome/app
parent2d84f38d8436b224904e95a68bb69ea05d302cb3 (diff)
downloadchromium_src-ff70f7016825ed45ce244fb9db33d78f1c45f366.zip
chromium_src-ff70f7016825ed45ce244fb9db33d78f1c45f366.tar.gz
chromium_src-ff70f7016825ed45ce244fb9db33d78f1c45f366.tar.bz2
Stub in support for bluetooth settings in Chrome OS.
BUG=Partial fix for chromium-os:20991. TEST=Launch chromeOS with the command-line argument --enable_bluetooth, and switch to the System setttings page. A section for bluetooth devices appears below the touchpad section. Launching without the command-line argument suppresses the bluetooth section. Review URL: http://codereview.chromium.org/8084003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103476 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd9
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index daa0d5d..095d7b7 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -11141,6 +11141,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_TOUCHPAD">
Touchpad
</message>
+ <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_BLUETOOTH">
+ Bluetooth
+ </message>
<message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_LANGUAGE">
Language
</message>
@@ -11168,6 +11171,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_OPTIONS_SETTINGS_SENSITIVITY_MORE_DESCRIPTION" desc="In the settings tab, the text under the right (more sensitive) side of the slider for the touchpad touch sensitivity.">
Fast
</message>
+ <message name="IDS_OPTIONS_SETTINGS_BLUETOOTH_ENABLE">
+ Enable bluetooth
+ </message>
+ <message name="IDS_OPTIONS_SETTINGS_FIND_BLUETOOTH_DEVICES">
+ Find devices
+ </message>
<message name="IDS_OPTIONS_SETTINGS_ACCESSIBILITY_DESCRIPTION" desc="In the settings tab, the text next to the checkbox for accessbility.">
Enable accessibility features
</message>