[i18n-fixlet] Make strings branding specific in Wrench menu.

BUG=NONE
TEST=NONE


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

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

6 files changed, 61 insertions, 34 deletions

diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index 17b94b5..3593e00 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -599,6 +599,32 @@ The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" has been
         Remove from Chromium
       </message>
 
+      <!-- Wrench menu -->
+      <if expr="pp_ifdef('use_titlecase') and not pp_ifdef('chromeos')">
+        <message name="IDS_ABOUT" desc="In Title Case: The text label of the About Chrome menu item">
+          About &amp;Chromium
+        </message>
+        <message name="IDS_UPDATE_NOW" desc="In Title Case: The text label of the Update Chrome Now menu item">
+          Update &amp;Chromium
+        </message>
+      </if>
+      <if expr="not pp_ifdef('use_titlecase') and not pp_ifdef('chromeos')">
+        <message name="IDS_ABOUT" desc="The text label of the About Chrome menu item">
+          About &amp;Chromium
+        </message>
+        <message name="IDS_UPDATE_NOW" desc="The text label of the Update Chrome Now menu item">
+          Update &amp;Chromium
+        </message>
+      </if>
+      <if expr="pp_ifdef('chromeos')">
+        <message name="IDS_ABOUT" desc="The text label of the About Chrome OS menu item">
+          About &amp;Chromium OS
+        </message>
+        <message name="IDS_UPDATE_NOW" desc="The text label of the Update Chrome OS Now menu item">
+          Update &amp;Chromium OS
+        </message>
+      </if>
+
       <if expr="is_macosx">
         <message name="IDS_APP_MENU_PRODUCT_NAME" desc="The application's short name, used for the Mac's application menu, activity monitor, etc. This should be less than 16 characters. Example: Chrome, not Google Chrome.">
           Chromium
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 17aca57..c8bb570 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -1170,12 +1170,6 @@ are declared in build/common.gypi.
         <message name="IDS_HELP_PAGE" desc="The text label of the Help menu item">
           H&amp;elp
         </message>
-        <message name="IDS_ABOUT" desc="The text label of the About Chrome menu item">
-          About &amp;<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>
-        </message>
-        <message name="IDS_UPDATE_NOW" desc="The text label of the Update Chrome Now menu item">
-          Update &amp;<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>
-        </message>
         <message name="IDS_VIEW_INCOMPATIBILITIES" desc="The text label of the View incompatibilities menu item">
           View incompatibilities
         </message>
@@ -1217,12 +1211,6 @@ are declared in build/common.gypi.
         <message name="IDS_HELP_PAGE" desc="In Title Case: The text label of the Help menu item">
           H&amp;elp
         </message>
-        <message name="IDS_ABOUT" desc="In Title Case: The text label of the About Chrome menu item">
-          About &amp;<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>
-        </message>
-        <message name="IDS_UPDATE_NOW" desc="In Title Case: The text label of the Update Chrome Now menu item">
-          Update &amp;<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>
-        </message>
         <message name="IDS_VIEW_INCOMPATIBILITIES" desc="The text label of the View incompatibilities menu item">
           View Incompatibilities
         </message>
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index b104b24..e1dd0d9 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -574,6 +574,32 @@ The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" has been
         Remove from Chrome
       </message>
 
+      <!-- Wrench menu -->
+      <if expr="pp_ifdef('use_titlecase') and not pp_ifdef('chromeos')">
+        <message name="IDS_ABOUT" desc="In Title Case: The text label of the About Chrome menu item">
+          About &amp;Google Chrome
+        </message>
+        <message name="IDS_UPDATE_NOW" desc="In Title Case: The text label of the Update Chrome Now menu item">
+          Update &amp;Google Chrome
+        </message>
+      </if>
+      <if expr="not pp_ifdef('use_titlecase') and not pp_ifdef('chromeos')">
+        <message name="IDS_ABOUT" desc="The text label of the About Chrome menu item">
+          About &amp;Google Chrome
+        </message>
+        <message name="IDS_UPDATE_NOW" desc="The text label of the Update Chrome Now menu item">
+          Update &amp;Google Chrome
+        </message>
+      </if>
+      <if expr="pp_ifdef('chromeos')">
+        <message name="IDS_ABOUT" desc="The text label of the About Chrome OS menu item">
+          About &amp;Chrome OS
+        </message>
+        <message name="IDS_UPDATE_NOW" desc="The text label of the Update Chrome OS Now menu item">
+          Update &amp;Chrome OS
+        </message>
+      </if>
+
       <if expr="is_macosx">
         <message name="IDS_APP_MENU_PRODUCT_NAME" desc="The application's short name, used for the Mac's application menu, activity monitor, etc. This should be less than 16 characters. Example: Chrome, not Google Chrome.">
           Chrome
diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
index 1ab9fb3..141aa3c 100644
--- a/chrome/browser/background/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -668,8 +668,7 @@ void BackgroundModeManager::UpdateStatusTrayIconContextMenu() {
   // Create a context menu item for Chrome.
   ui::SimpleMenuModel* menu = new ui::SimpleMenuModel(this);
   // Add About item
-  menu->AddItem(IDC_ABOUT, l10n_util::GetStringFUTF16(IDS_ABOUT,
-      l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+  menu->AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT));
   menu->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
   menu->AddSeparator();
 
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index af05f08..8f87dfb 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -256,16 +256,8 @@ string16 WrenchMenuModel::GetLabelForCommandId(int command_id) const {
       return l10n_util::GetStringFUTF16(IDS_VIEW_BACKGROUND_PAGES,
                                         num_background_pages);
     }
-    case IDC_UPGRADE_DIALOG: {
-#if defined(OS_CHROMEOS)
-      const string16 product_name =
-          l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME);
-#else
-      const string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
-#endif
-
-      return l10n_util::GetStringFUTF16(IDS_UPDATE_NOW, product_name);
-    }
+    case IDC_UPGRADE_DIALOG:
+      return l10n_util::GetStringUTF16(IDS_UPDATE_NOW);
     case IDC_SHOW_SYNC_SETUP: {
       ProfileSyncService* service =
           browser_->GetProfile()->GetOriginalProfile()->GetProfileSyncService();
@@ -520,14 +512,12 @@ void WrenchMenuModel::Build() {
   AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS);
 #endif
 
-  const string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
-  AddItem(IDC_ABOUT, l10n_util::GetStringFUTF16(IDS_ABOUT, product_name));
+  AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT));
   string16 num_background_pages = base::FormatNumber(
       TaskManager::GetBackgroundPageCount());
   AddItem(IDC_VIEW_BACKGROUND_PAGES, l10n_util::GetStringFUTF16(
       IDS_VIEW_BACKGROUND_PAGES, num_background_pages));
-  AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringFUTF16(
-      IDS_UPDATE_NOW, product_name));
+  AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringUTF16(IDS_UPDATE_NOW));
   AddItem(IDC_VIEW_INCOMPATIBILITIES, l10n_util::GetStringUTF16(
       IDS_VIEW_INCOMPATIBILITIES));
 
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model_chromeos.cc b/chrome/browser/ui/toolbar/wrench_menu_model_chromeos.cc
index 89d24f6..faf67a4 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model_chromeos.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model_chromeos.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -47,15 +47,13 @@ void WrenchMenuModel::Build() {
   AddSeparator();
 
   AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS);
-  const string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME);
-  AddItem(IDC_ABOUT, l10n_util::GetStringFUTF16(IDS_ABOUT, product_name));
+  AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT));
   string16 num_background_pages = base::FormatNumber(
       TaskManager::GetBackgroundPageCount());
   AddItem(IDC_VIEW_BACKGROUND_PAGES,
       l10n_util::GetStringFUTF16(IDS_VIEW_BACKGROUND_PAGES,
           num_background_pages));
-  AddItem(IDC_UPGRADE_DIALOG,
-      l10n_util::GetStringFUTF16(IDS_UPDATE_NOW, product_name));
+  AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringUTF16(IDS_UPDATE_NOW));
   AddItem(IDC_VIEW_INCOMPATIBILITIES,
       l10n_util::GetStringUTF16(IDS_VIEW_INCOMPATIBILITIES));