cros: Clarify keyboard over Open Dialog string

* Clarify the Open Dialog string description for the translators.
* Fix some capitalization problems.
* Patch the generate script so it doesn't update the copyright year.

BUG=173522
TEST=visual, keyboard overlay for Ctrl-O says "Open"

Review URL: https://codereview.chromium.org/12087125

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180200 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 20 insertions, 23 deletions

diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp
index 0e7f741..575a3aba 100644
--- a/chrome/app/chromeos_strings.grdp
+++ b/chrome/app/chromeos_strings.grdp
@@ -2773,8 +2773,8 @@ Battery full
   <message name="IDS_KEYBOARD_OVERLAY_BOOKMARK_CURRENT_PAGE" desc="The text in the keyboard overlay to explain the shortcut.">
     Bookmark current page
   </message>
-  <message name="IDS_KEYBOARD_OVERLAY_BOOKMARK_MANAGER" desc="The text in the keyboard overlay to explain the shortcut (open the Bookmark Manager).">
-    Bookmark Manager
+  <message name="IDS_KEYBOARD_OVERLAY_BOOKMARK_MANAGER" desc="The text in the keyboard overlay to explain the shortcut (open the bookmark manager).">
+    Bookmark manager
   </message>
   <message name="IDS_KEYBOARD_OVERLAY_CENTER_WINDOW" desc="The text in the keyboard overlay to explain the shortcut (center the window).">
     Center window
@@ -2807,7 +2807,7 @@ Battery full
     Delete word
   </message>
   <message name="IDS_KEYBOARD_OVERLAY_DEVELOPER_TOOLS" desc="The text in the keyboard overlay to explain the shortcut.">
-    Developer Tools
+    Developer tools
   </message>
   <message name="IDS_KEYBOARD_OVERLAY_DOCK_WINDOW_LEFT" desc="The text in the keyboard overlay to explain the shortcut (dock the window to the left).">
     Dock window left
@@ -2816,7 +2816,7 @@ Battery full
     Dock window right
   </message>
   <message name="IDS_KEYBOARD_OVERLAY_DOM_INSPECTOR" desc="The text in the keyboard overlay to explain the shortcut.">
-    DOM Inspector
+    DOM inspector
   </message>
   <message name="IDS_KEYBOARD_OVERLAY_DOWNLOADS" desc="The text in the keyboard overlay to explain the shortcut.">
     Downloads
@@ -2879,7 +2879,7 @@ Battery full
     Input Unicode characters
   </message>
   <message name="IDS_KEYBOARD_OVERLAY_JAVASCRIPT_CONSOLE" desc="The text in the keyboard overlay to explain the shortcut.">
-    JavaScript Console
+    JavaScript console
   </message>
   <message name="IDS_KEYBOARD_OVERLAY_LOCK_SCREEN" desc="The text in the keyboard overlay to explain the shortcut (lock the screen).">
     Lock screen
@@ -2920,17 +2920,17 @@ Battery full
   <message name="IDS_KEYBOARD_OVERLAY_NEXT_WORD" desc="The text in the keyboard overlay to explain the shortcut (move the text cursor to the end of the next word).">
     Next word
   </message>
+  <message name="IDS_KEYBOARD_OVERLAY_OPEN" desc="The text in the keyboard overlay to explain the shortcut (open a file).">
+    Open
+  </message>
   <message name="IDS_KEYBOARD_OVERLAY_OPEN_ADDRESS_IN_NEW_TAB" desc="The text in the keyboard overlay to explain the shortcut.">
     Open address in new tab
   </message>
-  <message name="IDS_KEYBOARD_OVERLAY_OPEN_DIALOG" desc="The text in the keyboard overlay to explain the shortcut (open a dialog to select file).">
-    Open dialog
-  </message>
   <message name="IDS_KEYBOARD_OVERLAY_PAGE_DOWN" desc="The text in the keyboard overlay to explain the shortcut.">
-    Page Down
+    Page down
   </message>
   <message name="IDS_KEYBOARD_OVERLAY_PAGE_UP" desc="The text in the keyboard overlay to explain the shortcut.">
-    Page Up
+    Page up
   </message>
   <message name="IDS_KEYBOARD_OVERLAY_PASTE" desc="The text in the keyboard overlay to explain the shortcut.">
     Paste
@@ -2962,7 +2962,7 @@ Battery full
   <message name="IDS_KEYBOARD_OVERLAY_RESET_ZOOM" desc="The text in the keyboard overlay to explain the shortcut.">
     Reset zoom
   </message>
-  <message name="IDS_KEYBOARD_OVERLAY_SAVE" desc="The text in the keyboard overlay to explain the shortcut.">
+  <message name="IDS_KEYBOARD_OVERLAY_SAVE" desc="The text in the keyboard overlay to explain the shortcut (save page as a file).">
     Save
   </message>
   <message name="IDS_KEYBOARD_OVERLAY_SCREENSHOT_REGION" desc="The text in the keyboard overlay to explain the shortcut (take a screenshot of the selected region).">
@@ -2993,7 +2993,7 @@ Battery full
     Take screenshot
   </message>
   <message name="IDS_KEYBOARD_OVERLAY_TASK_MANAGER" desc="The text in the keyboard overlay to explain the shortcut.">
-    Task Manager
+    Task manager
   </message>
   <message name="IDS_KEYBOARD_OVERLAY_TOGGLE_BOOKMARK_BAR" desc="The text in the keyboard overlay to explain the shortcut.">
     Toggle bookmark bar
diff --git a/chrome/browser/resources/chromeos/keyboard_overlay_data.js b/chrome/browser/resources/chromeos/keyboard_overlay_data.js
index 169096d..6f8e7a2 100644
--- a/chrome/browser/resources/chromeos/keyboard_overlay_data.js
+++ b/chrome/browser/resources/chromeos/keyboard_overlay_data.js
@@ -15841,7 +15841,7 @@ var keyboardOverlayData = {
     'maximize<>SHIFT': 'keyboardOverlayFullScreen',
     'n<>CTRL': 'keyboardOverlayNewWindow',
     'n<>CTRL<>SHIFT': 'keyboardOverlayNewIncognitoWindow',
-    'o<>CTRL': 'keyboardOverlayOpenDialog',
+    'o<>CTRL': 'keyboardOverlayOpen',
     'o<>CTRL<>SHIFT': 'keyboardOverlayBookmarkManager',
     'p<>CTRL': 'keyboardOverlayPrint',
     'power': 'keyboardOverlayLockScreenOrPowerOff',
diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
index 333273a..89ba5f0 100644
--- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
@@ -173,9 +173,9 @@ struct I18nContentToMessage {
   { "keyboardOverlayNewWindow", IDS_KEYBOARD_OVERLAY_NEW_WINDOW },
   { "keyboardOverlayNextWindow", IDS_KEYBOARD_OVERLAY_NEXT_WINDOW },
   { "keyboardOverlayNextWord", IDS_KEYBOARD_OVERLAY_NEXT_WORD },
+  { "keyboardOverlayOpen", IDS_KEYBOARD_OVERLAY_OPEN },
   { "keyboardOverlayOpenAddressInNewTab",
     IDS_KEYBOARD_OVERLAY_OPEN_ADDRESS_IN_NEW_TAB },
-  { "keyboardOverlayOpenDialog", IDS_KEYBOARD_OVERLAY_OPEN_DIALOG },
   { "keyboardOverlayPageDown", IDS_KEYBOARD_OVERLAY_PAGE_DOWN },
   { "keyboardOverlayPageUp", IDS_KEYBOARD_OVERLAY_PAGE_UP },
   { "keyboardOverlayPaste", IDS_KEYBOARD_OVERLAY_PASTE },
diff --git a/tools/gen_keyboard_overlay_data/gen_keyboard_overlay_data.py b/tools/gen_keyboard_overlay_data/gen_keyboard_overlay_data.py
index 81c02cf..dd108c9 100755
--- a/tools/gen_keyboard_overlay_data/gen_keyboard_overlay_data.py
+++ b/tools/gen_keyboard_overlay_data/gen_keyboard_overlay_data.py
@@ -154,11 +154,13 @@ INPUT_METHOD_ID_TO_OVERLAY_ID = {
   'zinnia-japanese': 'ja',
 }
 
-COPYRIGHT_HEADER_TEMPLATE=(
-"""// Copyright (c) %s The Chromium Authors. All rights reserved.
+# The file was first generated in 2012 and we have a policy of not updating
+# copyright dates.
+COPYRIGHT_HEADER=\
+"""// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-""")
+"""
 
 # A snippet for grd file
 GRD_SNIPPET_TEMPLATE="""  <message name="%s" desc="%s">
@@ -404,11 +406,6 @@ def FetchHotkeyData(client):
   return result
 
 
-def GenerateCopyrightHeader():
-  """Generates the copyright header for JavaScript code."""
-  return COPYRIGHT_HEADER_TEMPLATE % datetime.date.today().year
-
-
 def UniqueBehaviors(hotkey_data):
   """Retrieves a sorted list of unique behaviors from |hotkey_data|."""
   return sorted(set((behavior, description) for (behavior, _, description)
@@ -427,7 +424,7 @@ def GetPath(path_from_src):
 def OutputFile(outpath, snippet):
   """Output the snippet into the specified path."""
   out = file(outpath, 'w')
-  out.write(GenerateCopyrightHeader() + '\n')
+  out.write(COPYRIGHT_HEADER + '\n')
   out.write(snippet)
   print 'Output ' + os.path.normpath(outpath)