From fe0e3cedac9a41f0e2b69c5dcdc681821f8a89e4 Mon Sep 17 00:00:00 2001
From: "mazda@chromium.org"
 <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 22 Aug 2012 23:03:30 +0000
Subject: Update the texts of the caps lock tray.

Change the shortcut strings in trays as follows.
- To turn off caps lock: Alt+Search or Shift
- To turn on caps lock: Alt+Search

When Search key is remapped to Caps Lock key, show Search instead of Alt+Search.

BUG=138575


Review URL: https://chromiumcodereview.appspot.com/10875004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152865 0039d316-1c4b-4281-b951-d872f2087c98
---
 ash/ash_strings.grd | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'ash/ash_strings.grd')

diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
index f3823a5..dff373c 100644
--- a/ash/ash_strings.grd
+++ b/ash/ash_strings.grd
@@ -349,16 +349,22 @@ Press Ctrl+Alt+Z to cancel.
       <message name="IDS_ASH_STATUS_TRAY_CAPS_LOCK_SHORTCUT_SEARCH" desc="The shortcut text used for the caps lock tray item.">
         Search
       </message>
-      <message name="IDS_ASH_STATUS_TRAY_CAPS_LOCK_SHORTCUT_SHIFT_SEARCH" desc="The shortcut text used for the caps lock tray item.">
-        Shift+Search
+      <message name="IDS_ASH_STATUS_TRAY_CAPS_LOCK_SHORTCUT_SEARCH_OR_SHIFT" desc="The shortcut text used for the caps lock tray item.">
+        Search or Shift
       </message>
-      <message name="IDS_ASH_STATUS_TRAY_CAPS_LOCK_ENABLED_PRESS_SHIFT_AND_SEARCH_KEYS" desc="The tooltip for the caps lock indicator button.">
+      <message name="IDS_ASH_STATUS_TRAY_CAPS_LOCK_SHORTCUT_ALT_SEARCH" desc="The shortcut text used for the caps lock tray item.">
+        Alt+Search
+      </message>
+      <message name="IDS_ASH_STATUS_TRAY_CAPS_LOCK_SHORTCUT_ALT_SEARCH_OR_SHIFT" desc="The shortcut text used for the caps lock tray item.">
+        Alt+Search or Shift
+      </message>
+      <message name="IDS_ASH_STATUS_TRAY_CAPS_LOCK_CANCEL_BY_ALT_SEARCH" desc="The message shown on a bubble when caps lock is turned on.">
 CAPS LOCK is on.
-Press Shift + Search key to cancel.
+Press Alt+Search or Shift to cancel.
       </message>
-      <message name="IDS_ASH_STATUS_TRAY_CAPS_LOCK_ENABLED_PRESS_SEARCH" desc="The tooltip for the caps lock indicator button.">
+      <message name="IDS_ASH_STATUS_TRAY_CAPS_LOCK_CANCEL_BY_SEARCH" desc="The message shown on a bubble when caps lock is turned on.">
 CAPS LOCK is on.
-Press Search key to cancel.
+Press Search or Shift to cancel.
       </message>
       <message name="IDS_ASH_STATUS_TRAY_IME_TURNED_ON_BUBBLE" desc="The message shown on a bubble when an IME is enabled">
         Your input method has changed to <ph name="INPUT_METHOD_ID">$1<ex>EN</ex></ph>.
-- 
cgit v1.1