summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichaelpg <michaelpg@chromium.org>2015-11-10 10:04:44 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-10 18:06:00 +0000
commit76c1cfc82d78fc8eb503ba300021a816d39538d5 (patch)
tree993f73ee9f3405fb4b9d9fb165620956e3a4b8c4
parent37829a5c713e53ebc33f31667932bb3e46a799d5 (diff)
downloadchromium_src-76c1cfc82d78fc8eb503ba300021a816d39538d5.zip
chromium_src-76c1cfc82d78fc8eb503ba300021a816d39538d5.tar.gz
chromium_src-76c1cfc82d78fc8eb503ba300021a816d39538d5.tar.bz2
MD Settings: a11y-page text
the subLabel wasn't doing anything (should have been "sub-label" or ".subLabel") and doesn't match the mocks anyway BUG=537048 R=dbeam@chromium.org Review URL: https://codereview.chromium.org/1416333006 Cr-Commit-Position: refs/heads/master@{#358849}
-rw-r--r--chrome/app/settings_strings.grdp14
-rw-r--r--chrome/browser/resources/settings/a11y_page/a11y_page.html4
-rw-r--r--chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc4
3 files changed, 6 insertions, 16 deletions
diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
index 7108217..54a8f27 100644
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -23,17 +23,11 @@
<message name="IDS_SETTINGS_HIGH_CONTRAST_LABEL" desc="Label for checkbox which enables high-contrast UI.">
Use high contrast mode
</message>
- <message name="IDS_SETTINGS_STICKY_KEYS_LABEL" desc="Label for checkbox which enables sticky keys.">
- Enable sticky keys
+ <message name="IDS_SETTINGS_STICKY_KEYS_LABEL" desc="Label for checkbox which enables sticky keys, with an explanation of the term 'sticky keys'.">
+ Enable sticky keys (to perform keyboard shortcuts by typing them sequentially)
</message>
- <message name="IDS_SETTINGS_STICKY_KEYS_SUBLABEL" desc="Sub-label describing what the term 'sticky keys' means.">
- (to perform keyboard shortcuts by typing them sequentially)
- </message>
- <message name="IDS_SETTINGS_CHROMEVOX_LABEL" desc="Label for checkbox which enables ChromeVox">
- Enable ChromeVox
- </message>
- <message name="IDS_SETTINGS_CHROMEVOX_SUBLABEL" desc="Sub-label describingn what ChromeVox is.">
- (spoken feedback)
+ <message name="IDS_SETTINGS_CHROMEVOX_LABEL" desc="Label for checkbox which enables ChromeVox, with a description of what ChromeVox is.">
+ Enable ChromeVox (spoken feedback)
</message>
<message name="IDS_SETTINGS_SCREEN_MAGNIFIER_LABEL" desc="Label for checkbox which enables the screen magnifier">
Enable screen magnifier
diff --git a/chrome/browser/resources/settings/a11y_page/a11y_page.html b/chrome/browser/resources/settings/a11y_page/a11y_page.html
index 5afc4c7..fbea6e3 100644
--- a/chrome/browser/resources/settings/a11y_page/a11y_page.html
+++ b/chrome/browser/resources/settings/a11y_page/a11y_page.html
@@ -21,10 +21,10 @@
</settings-checkbox>
<settings-checkbox
pref="{{prefs.settings.a11y.sticky_keys_enabled}}"
- i18n-values="label:stickyKeysLabel; subLabel:stickyKeysSublabel">
+ i18n-values="label:stickyKeysLabel">
</settings-checkbox>
<settings-checkbox pref="{{prefs.settings.accessibility}}"
- i18n-values="label:chromeVoxLabel; subLabel:chromeVoxSublabel">
+ i18n-values="label:chromeVoxLabel">
</settings-checkbox>
<settings-checkbox i18n-values="label:screenMagnifierLabel"
pref="{{prefs.settings.a11y.screen_magnifier}}">
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
index d19a095..768313c 100644
--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -58,12 +58,8 @@ void AddA11yStrings(content::WebUIDataSource* html_source) {
html_source->AddLocalizedString(
"stickyKeysLabel", IDS_SETTINGS_STICKY_KEYS_LABEL);
html_source->AddLocalizedString(
- "stickyKeysSublabel", IDS_SETTINGS_STICKY_KEYS_SUBLABEL);
- html_source->AddLocalizedString(
"chromeVoxLabel", IDS_SETTINGS_CHROMEVOX_LABEL);
html_source->AddLocalizedString(
- "chromeVoxSublabel", IDS_SETTINGS_CHROMEVOX_SUBLABEL);
- html_source->AddLocalizedString(
"screenMagnifierLabel", IDS_SETTINGS_SCREEN_MAGNIFIER_LABEL);
html_source->AddLocalizedString(
"tapDraggingLabel", IDS_SETTINGS_TAP_DRAGGING_LABEL);