Cleanup, part 1.

* Consistently use underscores between words in identifiers (IDC_NEWTAB -> IDC_NEW_TAB)
* Make some identifiers clearer or more up-to-date (IDC_DUPLICATE -> IDC_DUPLICATE_TAB, IDC_GOOFFTHERECORD -> IDC_NEW_INCOGNITO_WINDOW, IDC_NEWPROFILEWINDOW -> IDC_PROFILE_MENU)
* Try and make string identifiers (IDS_xxx) match their corresponding IDC_xxx commands.  Tony tells me this will not cause any need for retranslation.
* As much as possible (without modifying automated UI test XML files), use "Bookmark Bar", not "Bookmarks Bar" (this seemed to be prevailing usage in the code)
* Fix 80-column issues

This patch touches move files than any subsequent patches, but should be the most rubber-stampable.

Review URL: http://codereview.chromium.org/13633

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

3 files changed, 99 insertions, 99 deletions

diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index 0c0a564..da31f89 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -34,15 +34,15 @@ IDR_MAINFRAME ACCELERATORS
 BEGIN
     VK_LEFT,             IDC_BACK,           VIRTKEY, ALT
     VK_BACK,             IDC_BACK,           VIRTKEY
-    VK_F4,               IDC_CLOSETAB,       VIRTKEY, CONTROL
-    "W",                 IDC_CLOSETAB,       VIRTKEY, CONTROL
-    "W",                 IDC_CLOSEPOPUPS,    VIRTKEY, SHIFT, ALT
-    "L",                 IDC_DEBUGGER,       VIRTKEY, SHIFT, CONTROL
-    "J",                 IDC_SHOW_JS_CONSOLE,VIRTKEY, SHIFT, CONTROL
+    VK_F4,               IDC_CLOSE_TAB,      VIRTKEY, CONTROL
+    "W",                 IDC_CLOSE_TAB,      VIRTKEY, CONTROL
+    "W",                 IDC_CLOSE_POPUPS,   VIRTKEY, SHIFT, ALT
+    "L",                 IDC_DEBUGGER,       VIRTKEY, CONTROL, SHIFT
+    "J",                 IDC_JS_CONSOLE,     VIRTKEY, CONTROL, SHIFT
     "F",                 IDC_FIND,           VIRTKEY, CONTROL
     "G",                 IDC_FIND_NEXT,      VIRTKEY, CONTROL
     VK_F3,               IDC_FIND_NEXT,      VIRTKEY
-    "G",                 IDC_FIND_PREVIOUS,  VIRTKEY, SHIFT, CONTROL
+    "G",                 IDC_FIND_PREVIOUS,  VIRTKEY, CONTROL, SHIFT
     VK_F3,               IDC_FIND_PREVIOUS,  VIRTKEY, SHIFT
     VK_F6,               IDC_FOCUS_LOCATION, VIRTKEY
     "D",                 IDC_FOCUS_LOCATION, VIRTKEY, ALT
@@ -52,34 +52,34 @@ BEGIN
     "T",                 IDC_FOCUS_TOOLBAR,  VIRTKEY, SHIFT, ALT
     VK_RIGHT,            IDC_FORWARD,        VIRTKEY, ALT
     VK_BACK,             IDC_FORWARD,        VIRTKEY, SHIFT
-    VK_F1,               IDC_HELPMENU,       VIRTKEY
-    "T",                 IDC_NEWTAB,         VIRTKEY, CONTROL
-    "N",                 IDC_NEWWINDOW,      VIRTKEY, CONTROL
+    VK_F1,               IDC_HELP_PAGE,      VIRTKEY
+    "T",                 IDC_NEW_TAB,        VIRTKEY, CONTROL
+    "N",                 IDC_NEW_WINDOW,     VIRTKEY, CONTROL
     // CTRL + M is used for opening the dialog to let the user select
     // a profile to open a new window.
     // CTRL + SHIFT + N (N = 1 to 9) is used to let the user open a new
     // window in profile 1 to profile 9 directly.
-    "M",                 IDC_NEWPROFILEWINDOW,            VIRTKEY,    CONTROL
-    "1",                 IDC_NEWPROFILEWINDOW_PROFILE1,   VIRTKEY,    CONTROL, SHIFT
-    VK_NUMPAD1,          IDC_NEWPROFILEWINDOW_PROFILE1,   VIRTKEY,    CONTROL, SHIFT
-    "2",                 IDC_NEWPROFILEWINDOW_PROFILE2,   VIRTKEY,    CONTROL, SHIFT
-    VK_NUMPAD2,          IDC_NEWPROFILEWINDOW_PROFILE2,   VIRTKEY,    CONTROL, SHIFT
-    "3",                 IDC_NEWPROFILEWINDOW_PROFILE3,   VIRTKEY,    CONTROL, SHIFT
-    VK_NUMPAD3,          IDC_NEWPROFILEWINDOW_PROFILE3,   VIRTKEY,    CONTROL, SHIFT
-    "4",                 IDC_NEWPROFILEWINDOW_PROFILE4,   VIRTKEY,    CONTROL, SHIFT
-    VK_NUMPAD4,          IDC_NEWPROFILEWINDOW_PROFILE4,   VIRTKEY,    CONTROL, SHIFT
-    "5",                 IDC_NEWPROFILEWINDOW_PROFILE5,   VIRTKEY,    CONTROL, SHIFT
-    VK_NUMPAD5,          IDC_NEWPROFILEWINDOW_PROFILE5,   VIRTKEY,    CONTROL, SHIFT
-    "6",                 IDC_NEWPROFILEWINDOW_PROFILE6,   VIRTKEY,    CONTROL, SHIFT
-    VK_NUMPAD6,          IDC_NEWPROFILEWINDOW_PROFILE6,   VIRTKEY,    CONTROL, SHIFT
-    "7",                 IDC_NEWPROFILEWINDOW_PROFILE7,   VIRTKEY,    CONTROL, SHIFT
-    VK_NUMPAD7,          IDC_NEWPROFILEWINDOW_PROFILE7,   VIRTKEY,    CONTROL, SHIFT
-    "8",                 IDC_NEWPROFILEWINDOW_PROFILE8,   VIRTKEY,    CONTROL, SHIFT
-    VK_NUMPAD8,          IDC_NEWPROFILEWINDOW_PROFILE8,   VIRTKEY,    CONTROL, SHIFT
-    "9",                 IDC_NEWPROFILEWINDOW_PROFILE9,   VIRTKEY,    CONTROL, SHIFT
-    VK_NUMPAD9,          IDC_NEWPROFILEWINDOW_PROFILE9,   VIRTKEY,    CONTROL, SHIFT
-    "N",                 IDC_GOOFFTHERECORD, VIRTKEY, CONTROL, SHIFT
-    "O",                 IDC_OPENFILE,       VIRTKEY, CONTROL
+    "M",                 IDC_SELECT_PROFILE,        VIRTKEY, CONTROL
+    "1",                 IDC_NEW_WINDOW_PROFILE_0,  VIRTKEY, CONTROL, SHIFT
+    VK_NUMPAD1,          IDC_NEW_WINDOW_PROFILE_0,  VIRTKEY, CONTROL, SHIFT
+    "2",                 IDC_NEW_WINDOW_PROFILE_1,  VIRTKEY, CONTROL, SHIFT
+    VK_NUMPAD2,          IDC_NEW_WINDOW_PROFILE_1,  VIRTKEY, CONTROL, SHIFT
+    "3",                 IDC_NEW_WINDOW_PROFILE_2,  VIRTKEY, CONTROL, SHIFT
+    VK_NUMPAD3,          IDC_NEW_WINDOW_PROFILE_2,  VIRTKEY, CONTROL, SHIFT
+    "4",                 IDC_NEW_WINDOW_PROFILE_3,  VIRTKEY, CONTROL, SHIFT
+    VK_NUMPAD4,          IDC_NEW_WINDOW_PROFILE_3,  VIRTKEY, CONTROL, SHIFT
+    "5",                 IDC_NEW_WINDOW_PROFILE_4,  VIRTKEY, CONTROL, SHIFT
+    VK_NUMPAD5,          IDC_NEW_WINDOW_PROFILE_4,  VIRTKEY, CONTROL, SHIFT
+    "6",                 IDC_NEW_WINDOW_PROFILE_5,  VIRTKEY, CONTROL, SHIFT
+    VK_NUMPAD6,          IDC_NEW_WINDOW_PROFILE_5,  VIRTKEY, CONTROL, SHIFT
+    "7",                 IDC_NEW_WINDOW_PROFILE_6,  VIRTKEY, CONTROL, SHIFT
+    VK_NUMPAD7,          IDC_NEW_WINDOW_PROFILE_6,  VIRTKEY, CONTROL, SHIFT
+    "8",                 IDC_NEW_WINDOW_PROFILE_7,  VIRTKEY, CONTROL, SHIFT
+    VK_NUMPAD8,          IDC_NEW_WINDOW_PROFILE_7,  VIRTKEY, CONTROL, SHIFT
+    "9",                 IDC_NEW_WINDOW_PROFILE_8,  VIRTKEY, CONTROL, SHIFT
+    VK_NUMPAD9,          IDC_NEW_WINDOW_PROFILE_8,  VIRTKEY, CONTROL, SHIFT
+    "N",                 IDC_NEW_INCOGNITO_WINDOW,  VIRTKEY, CONTROL, SHIFT
+    "O",                 IDC_OPEN_FILE,      VIRTKEY, CONTROL
     "P",                 IDC_PRINT,          VIRTKEY, CONTROL
     "R",                 IDC_RELOAD,         VIRTKEY, CONTROL
     VK_F5,               IDC_RELOAD,         VIRTKEY
@@ -87,13 +87,13 @@ BEGIN
     VK_F5,               IDC_RELOAD,         VIRTKEY, SHIFT
     VK_HOME,             IDC_HOME,           VIRTKEY, ALT
     "T",                 IDC_RESTORE_TAB,    VIRTKEY, CONTROL, SHIFT
-    "S",                 IDC_SAVEPAGE,       VIRTKEY, CONTROL
+    "S",                 IDC_SAVE_PAGE,      VIRTKEY, CONTROL
     "9",                 IDC_SELECT_LAST_TAB,VIRTKEY, CONTROL
     VK_NUMPAD9,          IDC_SELECT_LAST_TAB,VIRTKEY, CONTROL
     VK_TAB,              IDC_SELECT_NEXT_TAB,VIRTKEY, CONTROL
     VK_NEXT,             IDC_SELECT_NEXT_TAB,VIRTKEY, CONTROL
-    VK_TAB,              IDC_SELECT_PREV_TAB,VIRTKEY, SHIFT, CONTROL
-    VK_PRIOR,            IDC_SELECT_PREV_TAB,VIRTKEY, CONTROL
+    VK_TAB,              IDC_SELECT_PREVIOUS_TAB,   VIRTKEY, CONTROL, SHIFT
+    VK_PRIOR,            IDC_SELECT_PREVIOUS_TAB,   VIRTKEY, CONTROL
 // NOTE: IDC_SELECT_TAB_N is bound to the key N+1, and selects the tab at
 // index N. For example, IDC_SELECT_TAB_0 is bound to control 1, and selects
 // the tab at index 0.
@@ -113,14 +113,14 @@ BEGIN
     VK_NUMPAD7,          IDC_SELECT_TAB_6,   VIRTKEY, CONTROL
     "8",                 IDC_SELECT_TAB_7,   VIRTKEY, CONTROL
     VK_NUMPAD8,          IDC_SELECT_TAB_7,   VIRTKEY, CONTROL
-    "B",                 IDC_SHOW_BOOKMARKS_BAR, VIRTKEY, CONTROL
+    "B",                 IDC_SHOW_BOOKMARK_BAR,     VIRTKEY, CONTROL
     "B",                 IDC_SHOW_BOOKMARK_MANAGER, VIRTKEY, CONTROL, SHIFT
     "J",                 IDC_SHOW_DOWNLOADS, VIRTKEY, CONTROL
     "H",                 IDC_SHOW_HISTORY,   VIRTKEY, CONTROL
     "D",                 IDC_STAR,           VIRTKEY, CONTROL
     VK_ESCAPE,           IDC_STOP,           VIRTKEY
-    VK_ESCAPE,           IDC_TASKMANAGER,    VIRTKEY, SHIFT
-    "U",                 IDC_VIEWSOURCE,     VIRTKEY, CONTROL
+    VK_ESCAPE,           IDC_TASK_MANAGER,   VIRTKEY, SHIFT
+    "U",                 IDC_VIEW_SOURCE,    VIRTKEY, CONTROL
     VK_OEM_MINUS,        IDC_ZOOM_MINUS,     VIRTKEY, CONTROL
     VK_OEM_MINUS,        IDC_ZOOM_MINUS,     VIRTKEY, CONTROL, SHIFT
     VK_SUBTRACT,         IDC_ZOOM_MINUS,     VIRTKEY, CONTROL
@@ -180,7 +180,7 @@ IDR_MAINFRAME           ICON                    "theme\chromium\chromium.ico"
 // Bitmap
 //
 
-IDR_CRASHED_PLUGIN      BINDATA                 "resources\\sadplugin.png"
+IDR_SAD_PLUGIN      BINDATA                     "resources\\sadplugin.png"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h
index 7b57ade..d040e6d 100644
--- a/chrome/app/chrome_dll_resource.h
+++ b/chrome/app/chrome_dll_resource.h
@@ -33,25 +33,25 @@
 #define IDC_STOP                        32770
 #define IDC_RELOAD                      32771
 #define IDC_GO                          32772
-#define IDC_NEWTAB                      32773
-#define IDC_CLOSETAB                    32774
-#define IDC_NEWWINDOW                   32775
-#define IDC_CLOSEWINDOW                 32776
+#define IDC_NEW_TAB                     32773
+#define IDC_CLOSE_TAB                   32774
+#define IDC_NEW_WINDOW                  32775
+#define IDC_CLOSE_WINDOW                32776
 #define IDC_FOCUS_LOCATION              32777
 #define IDC_FOCUS_SEARCH                32778
 #define IDC_STAR                        32779
-#define IDC_OPENURL                     32780
+#define IDC_OPEN_CURRENT_URL            32780
 #define IDC_FIND                        32781
 #define IDC_FIND_NEXT                   32782
 #define IDC_FIND_PREVIOUS               32783
 #define IDC_CUT                         32784
 #define IDC_COPY                        32785
 #define IDC_PASTE                       32786
-#define IDC_SAVEPAGE                    32787
+#define IDC_SAVE_PAGE                   32787
 #define IDC_PRINT                       32788
-#define IDC_VIEWSOURCE                  32789
+#define IDC_VIEW_SOURCE                 32789
 #define IDC_SELECT_NEXT_TAB             32790
-#define IDC_SELECT_PREV_TAB             32791
+#define IDC_SELECT_PREVIOUS_TAB         32791
 #define IDC_SELECT_TAB_0                32792
 #define IDC_SELECT_TAB_1                32793
 #define IDC_SELECT_TAB_2                32794
@@ -61,7 +61,7 @@
 #define IDC_SELECT_TAB_6                32798
 #define IDC_SELECT_TAB_7                32799
 #define IDC_SELECT_LAST_TAB             32800
-#define IDC_CREATE_SHORTCUT             32801
+#define IDC_CREATE_SHORTCUTS            32801
 #define IDC_SHOWALLTABS_NEXT            32802
 #define IDC_SHOWALLTABS_PREV            32803
 #define IDC_SHOWALLTABS                 32804
@@ -69,15 +69,15 @@
 #define IDC_ZOOM_PLUS                   32806
 #define IDC_ZOOM_MINUS                  32807
 #define IDC_ZOOM_NORMAL                 32808
-#define IDC_OPENFILE                    32809
-#define IDC_ZOOM                        32810
-#define IDC_TASKMANAGER                 32812
-#define IDC_CLOSEPOPUPS                 32813
+#define IDC_OPEN_FILE                   32809
+#define IDC_ZOOM_MENU                   32810
+#define IDC_TASK_MANAGER                32812
+#define IDC_CLOSE_POPUPS                32813
 #define IDC_ALWAYS_ON_TOP               32814
 #define IDC_COPY_URL                    32815
-#define IDC_SHOW_JS_CONSOLE             32816
-#define IDC_DUPLICATE                   32817
-#define IDC_GOOFFTHERECORD              32818
+#define IDC_JS_CONSOLE                  32816
+#define IDC_DUPLICATE_TAB               32817
+#define IDC_NEW_INCOGNITO_WINDOW        32818
 #define IDC_VIEW_PASSWORDS              32819
 #define IDC_SHOW_APPLICATIONS           32820
 #define IDC_SHOW_DOWNLOADS              32821
@@ -90,8 +90,9 @@
 #define IDC_ABOUT                       32829
 #define IDC_IMPORT_SETTINGS             32830
 #define IDC_OPTIONS                     32831
-// Free space 32832 - 32890
-#define IDC_ENCODING                    32891
+#define IDC_REPORT_BUG                  32832
+// Free space 32833 - 32890
+#define IDC_ENCODING_MENU               32891
 #define IDC_ENCODING_AUTO_DETECT        32892
 #define IDC_ENCODING_UTF8               32893
 #define IDC_ENCODING_UTF16LE            32894
@@ -133,48 +134,47 @@
 // Spell-check suggestions.
 // If more suggestions have to be inserted, insert them before the _LAST
 // These have to be consecutive.
-#define IDC_USESPELLCHECKSUGGESTION_0     32930
-#define IDC_USESPELLCHECKSUGGESTION_1     32931
-#define IDC_USESPELLCHECKSUGGESTION_2     32932
-#define IDC_USESPELLCHECKSUGGESTION_3     32933
-#define IDC_USESPELLCHECKSUGGESTION_4     32934
+#define IDC_SPELLCHECK_SUGGESTION_0     32930
+#define IDC_SPELLCHECK_SUGGESTION_1     32931
+#define IDC_SPELLCHECK_SUGGESTION_2     32932
+#define IDC_SPELLCHECK_SUGGESTION_3     32933
+#define IDC_SPELLCHECK_SUGGESTION_4     32934
 // We leave some empty room here (35-39) in case we need to grow.
-#define IDC_USESPELLCHECKSUGGESTION_LAST  IDC_USESPELLCHECKSUGGESTION_4
+#define IDC_SPELLCHECK_SUGGESTION_LAST  IDC_SPELLCHECK_SUGGESTION_4
 #define IDC_RESTORE_TAB                 32940
 #define IDC_SHOW_AS_TAB                 32941
 #define IDC_EXIT                        32942
 #define IDC_DEBUGGER                    32943
-#define IDC_DEVELOPER                   32944
-#define IDC_HELPMENU                    32945
-#define IDC_SHOW_BOOKMARKS_BAR          32946
+#define IDC_DEVELOPER_MENU              32944
+#define IDC_HELP_PAGE                   32945
+#define IDC_SHOW_BOOKMARK_BAR           32946
 // Free space 32947 - 32950
-#define IDR_CRASHED_PLUGIN              32951
+#define IDR_SAD_PLUGIN                  32951
 #define IDC_SHOW_BOOKMARK_MANAGER       32952
-#define IDC_SHOW_SPELLCHECKER_SUBMENU   32953
+#define IDC_SPELLCHECK_MENU             32953
 // Reserve space for 100 Spell Check languages - currently we have 30.
-#define IDC_SPELLCHECKER_LANGUAGE_FIRST 32954
-#define IDC_SPELLCHECKER_LANGUAGE_LAST  33054
+#define IDC_SPELLCHECK_LANGUAGES_FIRST  32954
+#define IDC_SPELLCHECK_LANGUAGES_LAST   33054
 // We have a menu item for opening a new window in a specific profile, and it
 // has dynamic number of sub menu items. The number of sub menu items depends on
 // the number of existing profiles. But we only show menu items for nine
 // different profiles, plus a menu item for other than the nine profiles (if
 // there are more than nine profiles), plus a menu item for new profile.
-#define IDC_NEWPROFILEWINDOW            33055
+#define IDC_PROFILE_MENU                33055
 #define IDC_SELECT_PROFILE              33056
 #define IDC_NEW_PROFILE                 33057
 // Define menu IDs for nine profiles to provide accelarators like CTRL +
 // SHIFT + 1, CTRL + SHIFT + 2, etc. for them.
-#define IDC_NEWPROFILEWINDOW_PROFILE1   33058
-#define IDC_NEWPROFILEWINDOW_PROFILE2   33059
-#define IDC_NEWPROFILEWINDOW_PROFILE3   33060
-#define IDC_NEWPROFILEWINDOW_PROFILE4   33061
-#define IDC_NEWPROFILEWINDOW_PROFILE5   33062
-#define IDC_NEWPROFILEWINDOW_PROFILE6   33063
-#define IDC_NEWPROFILEWINDOW_PROFILE7   33064
-#define IDC_NEWPROFILEWINDOW_PROFILE8   33065
-#define IDC_NEWPROFILEWINDOW_PROFILE9   33066
-#define IDC_NEWPROFILEWINDOW_MIN_ID     IDC_NEWPROFILEWINDOW_PROFILE1
-#define IDC_NEWPROFILEWINDOW_MAX_ID     IDC_NEWPROFILEWINDOW_PROFILE9
+#define IDC_NEW_WINDOW_PROFILE_0        33058
+#define IDC_NEW_WINDOW_PROFILE_1        33059
+#define IDC_NEW_WINDOW_PROFILE_2        33060
+#define IDC_NEW_WINDOW_PROFILE_3        33061
+#define IDC_NEW_WINDOW_PROFILE_4        33062
+#define IDC_NEW_WINDOW_PROFILE_5        33063
+#define IDC_NEW_WINDOW_PROFILE_6        33064
+#define IDC_NEW_WINDOW_PROFILE_7        33065
+#define IDC_NEW_WINDOW_PROFILE_8        33066
+#define IDC_NEW_WINDOW_PROFILE_LAST     IDC_NEW_WINDOW_PROFILE_8
 
 // Next default values for new objects
 //
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 492ecea..24d568d 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -360,7 +360,7 @@ each locale. -->
       <message name="IDS_CONTENT_CONTEXT_NO_SPELLING_SUGGESTIONS" desc="The name of the No Spelling Suggestions display in the content area context menu">
         &amp;No spelling suggestions
       </message>
-      <message name="IDS_CONTENT_CONTEXT_SPELLCHECK_OPTIONS" desc="The name of the Spellcheck Options display in the content area context menu">
+      <message name="IDS_CONTENT_CONTEXT_SPELLCHECK_MENU" desc="The name of the Spellcheck Options submenu in the content area context menu">
         &amp;Spell-checker options
       </message>
       <message name="IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS" desc="The name of the Language Settings command in the content area context menu">
@@ -383,22 +383,22 @@ each locale. -->
       </message>
 
       <!-- Page menu -->
-      <message name="IDS_NEWTAB" desc="The text label of the New Tab menu item">
+      <message name="IDS_NEW_TAB" desc="The text label of the New Tab menu item">
         New &amp;tab
       </message>
       <message name="IDS_SHOW_AS_TAB" desc="The text label for the Show As tab menu item">
         &amp;Show as tab
       </message>
-      <message name="IDS_NEWWINDOW" desc="The text label of the New Window menu item" >
+      <message name="IDS_NEW_WINDOW" desc="The text label of the New Window menu item" >
         &amp;New window
       </message>
-      <message name="IDS_NEWPROFILEWINDOW" desc="The text label of the New profile Window menu item" >
+      <message name="IDS_PROFILE_MENU" desc="The text label of the New profile Window menu item" >
         New window in &amp;profile
       </message>
-      <message name="IDS_NEWPROFILEWINDOW_OTHERPROFILE" desc="The text label of the sub menu item of New profile Window menu item to select a profile other than the ones displayed in the sub-menu items." >
+      <message name="IDS_SELECT_PROFILE" desc="The text label of the menu item to select a profile other than the ones displayed directly in the Profile submenu." >
         Other...
       </message>
-      <message name="IDS_GOOFFTHERECORD" desc="The text label of the New incognito window menu item">
+      <message name="IDS_NEW_INCOGNITO_WINDOW" desc="The text label of the New incognito window menu item">
         New &amp;incognito window
       </message>
       <message name="IDS_UNDO" desc="The text label of the Undo menu item" >
@@ -413,19 +413,19 @@ each locale. -->
       <message name="IDS_PASTE" desc="The text label of the Paste menu item" >
         &amp;Paste
       </message>
-      <message name="IDS_SELECTALL" desc="The text label of the Select All menu item" >
+      <message name="IDS_SELECT_ALL" desc="The text label of the Select All menu item" >
         Select &amp;all
       </message>
-      <message name="IDS_FIND_IN_PAGE" desc="The text label of the Find in Page menu item" >
+      <message name="IDS_FIND" desc="The text label of the Find in Page menu item" >
         &amp;Find in page
       </message>
-      <message name="IDS_SAVEPAGEAS" desc="The text label of the Save Page As menu item" >
+      <message name="IDS_SAVE_PAGE" desc="The text label of the Save Page As menu item" >
         Save page &amp;as...
       </message>
       <message name="IDS_PRINT" desc="The text label of the Print... menu item. Opens a dialog box to select print settings" >
         &amp;Print...
       </message>
-      <message name="IDS_ZOOM" desc="The text label of the Zoom submenu" >
+      <message name="IDS_ZOOM_MENU" desc="The text label of the Zoom submenu" >
         &amp;Zoom
       </message>
       <message name="IDS_ZOOM_PLUS" desc="The text label of the Make Text Larger menu item" >
@@ -437,7 +437,7 @@ each locale. -->
       <message name="IDS_ZOOM_MINUS" desc="The text label of the Make Text Smaller menu item" >
         &amp;Smaller
       </message>
-      <message name="IDS_ENCODING" desc="The text label of the Encoding submenu" >
+      <message name="IDS_ENCODING_MENU" desc="The text label of the Encoding submenu" >
         &amp;Encoding
       </message>
       <message name="IDS_ENCODING_AUTO_DETECT" desc="The text label of the Auto Dectect submenu" >
@@ -503,10 +503,10 @@ each locale. -->
       <message name="IDS_ENCODING_VIETNAMESE" desc="The text label of Vietnamese encoding" >
         Vietnamese
       </message>
-      <message name="IDS_DEVELOPER" desc="The text label of the Developer submenu">
+      <message name="IDS_DEVELOPER_MENU" desc="The text label of the Developer submenu">
         Developer
       </message>
-      <message name="IDS_VIEWPAGESOURCE" desc="The text label of the View Page Source menu item" >
+      <message name="IDS_VIEW_SOURCE" desc="The text label of the View Page Source menu item" >
         View s&amp;ource
       </message>
       <message name="IDS_VIEWPAGEINFO" desc="The text label of the View Page Info menu item" >
@@ -515,13 +515,13 @@ each locale. -->
       <message name="IDS_DEBUGGER" desc="The text label of the JavaScript debugger menu item">
         Debug JavaScript
       </message>
-      <message name="IDS_COMMANDS_REPORTBUG" desc="The text label of the Report Bug menu item">
+      <message name="IDS_REPORT_BUG" desc="The text label of the Report Bug menu item">
         &amp;Report bug or broken website...
       </message>
-      <message name="IDS_VIEWJSCONSOLE" desc="The text the menu to show the JS console">
+      <message name="IDS_JS_CONSOLE" desc="The text the menu to show the JS console">
         &amp;JavaScript console
       </message>
-      <message name="IDS_TASKMANAGER" desc="The text label of the Task Manager menu item" >
+      <message name="IDS_TASK_MANAGER" desc="The text label of the Task Manager menu item" >
         &amp;Task manager
       </message>
       <message name="IDS_CLOSE" desc="The close menu">
@@ -561,7 +561,7 @@ each locale. -->
       <message name="IDS_OPTIONS" desc="The text label of the Options menu item">
         &amp;Options
       </message>
-      <message name="IDS_HELP" desc="The text label of the Help menu item">
+      <message name="IDS_HELP_PAGE" desc="The text label of the Help menu item">
         Help
       </message>
       <message name="IDS_ABOUT" desc="The text label of the About Chrome menu item">
@@ -1283,7 +1283,7 @@ each locale. -->
       </message>
 
       <!-- Gears shortcut strings -->
-      <message name="IDS_DEFAULT_INSTALL_SITE_LABEL" desc="Default installation menu label">
+      <message name="IDS_CREATE_SHORTCUTS" desc="Default installation menu label">
         Create application &amp;shortcuts...
       </message>
 
@@ -2158,7 +2158,7 @@ each locale. -->
       <message name="IDS_APP_MENU_RELOAD" desc="The reload menu in application windows">
         Reload
       </message>
-      <message name="IDS_APP_MENU_DUPLICATE" meaning="Duplicate application window" desc="The duplicate / start new instance menu">
+      <message name="IDS_APP_MENU_DUPLICATE_APP_WINDOW" meaning="Duplicate application window" desc="The duplicate / start new instance menu">
         Duplicate
       </message>
       <message name="IDS_APP_MENU_COPY_URL" desc="The copy url menu in application windows">