[i18n-fixlet] Make strings branding specific in update code.

IDS_UPGRADE_AVAILABLE
IDS_UPGRADE_SUCCESSFUL
IDS_UPGRADE_SUCCESSFUL_NOVERSION
IDS_UPGRADE_SUCCESSFUL_RELAUNCH
IDS_UPGRADE_ALREADY_UP_TO_DATE

BUG=NONE
TEST=NONE


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=117770
Reverted: https://src.chromium.org/viewvc/chrome?view=rev&revision=117871

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

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

7 files changed, 56 insertions, 39 deletions

diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index d49a939..d111907 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -551,6 +551,30 @@ Chromium is unable to recover your settings.
          Chromium is no longer updating because your operating system is obsolete.
       </message>
 
+      <!-- About Chrome View -->
+      <message name="IDS_UPGRADE_AVAILABLE" desc="Status label: A new version of Chromium is available">
+        A new version of Chromium is available
+      </message>
+      <message name="IDS_UPGRADE_SUCCESSFUL" desc="Status label: Successfully upgraded">
+        Chromium has been updated to <ph name="VERSION">$1<ex>0.1.131</ex></ph>
+      </message>
+      <message name="IDS_UPGRADE_SUCCESSFUL_NOVERSION" desc="Status label: Successfully upgraded">
+        Chromium has been updated
+      </message>
+      <message name="IDS_UPGRADE_SUCCESSFUL_RELAUNCH" desc="Status label: Successfully updated">
+        Relaunch Chromium to finish updating
+      </message>
+      <if expr="pp_ifdef('chromeos')">
+        <message name="IDS_UPGRADE_ALREADY_UP_TO_DATE" desc="Status label: Already up to date">
+          Chromium is up to date
+        </message>
+      </if>
+      <if expr="not pp_ifdef('chromeos')">
+        <message name="IDS_UPGRADE_ALREADY_UP_TO_DATE" desc="Status label: Already up to date">
+          Chromium is up to date (<ph name="VERSION">$1<ex>0.1.131</ex></ph>)
+        </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 6fab004..2d4005b0 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6277,28 +6277,6 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
       <message name="IDS_UPGRADE_STARTED" desc="Status label: About to start updating Chrome">
         Installing new version...
       </message>
-      <message name="IDS_UPGRADE_AVAILABLE" desc="Status label: A new version of Chrome is available">
-        A new version of <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is available
-      </message>
-      <message name="IDS_UPGRADE_SUCCESSFUL" desc="Status label: Successfully upgraded">
-        <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> has been updated to <ph name="VERSION">$2<ex>0.1.131</ex></ph>
-      </message>
-      <message name="IDS_UPGRADE_SUCCESSFUL_NOVERSION" desc="Status label: Successfully upgraded">
-        <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> has been updated
-      </message>
-      <message name="IDS_UPGRADE_SUCCESSFUL_RELAUNCH" desc="Status label: Successfully updated">
-        Relaunch <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> to finish updating
-      </message>
-      <if expr="pp_ifdef('chromeos')">
-      <message name="IDS_UPGRADE_ALREADY_UP_TO_DATE" desc="Status label: Already up to date">
-        <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is up to date
-      </message>
-      </if>
-      <if expr="not pp_ifdef('chromeos')">
-      <message name="IDS_UPGRADE_ALREADY_UP_TO_DATE" desc="Status label: Already up to date">
-        <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is up to date (<ph name="VERSION">$2<ex>0.1.131</ex></ph>)
-      </message>
-      </if>
       <message name="IDS_UPGRADE_ERROR" desc="Status label: Error occurred during upgrade">
         Update server not available (error: <ph name="ERROR_NUMBER">$1<ex>1</ex></ph>)
       </message>
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index 6895832..a10c26c 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -526,6 +526,30 @@ Google Chrome is unable to recover your settings.
          Google Chrome is no longer updating because your operating system is obsolete.
       </message>
 
+      <!-- About Chrome View -->
+      <message name="IDS_UPGRADE_AVAILABLE" desc="Status label: A new version of Chrome is available">
+        A new version of Google Chrome is available
+      </message>
+      <message name="IDS_UPGRADE_SUCCESSFUL" desc="Status label: Successfully upgraded">
+        Google Chrome has been updated to <ph name="VERSION">$1<ex>0.1.131</ex></ph>
+      </message>
+      <message name="IDS_UPGRADE_SUCCESSFUL_NOVERSION" desc="Status label: Successfully upgraded">
+        Google Chrome has been updated
+      </message>
+      <message name="IDS_UPGRADE_SUCCESSFUL_RELAUNCH" desc="Status label: Successfully updated">
+        Relaunch Google Chrome to finish updating
+      </message>
+      <if expr="pp_ifdef('chromeos')">
+        <message name="IDS_UPGRADE_ALREADY_UP_TO_DATE" desc="Status label: Already up to date">
+          Google Chrome is up to date
+        </message>
+      </if>
+      <if expr="not pp_ifdef('chromeos')">
+        <message name="IDS_UPGRADE_ALREADY_UP_TO_DATE" desc="Status label: Already up to date">
+          Google Chrome is up to date (<ph name="VERSION">$1<ex>0.1.131</ex></ph>)
+        </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/ui/cocoa/about_window_controller.mm b/chrome/browser/ui/cocoa/about_window_controller.mm
index f156a40..d7fdf94 100644
--- a/chrome/browser/ui/cocoa/about_window_controller.mm
+++ b/chrome/browser/ui/cocoa/about_window_controller.mm
@@ -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.
 
@@ -461,15 +461,13 @@ static BOOL recentShownUserActionFailedStatus = NO;
       imageID = IDR_UPDATE_UPTODATE;
       message = l10n_util::GetNSStringFWithFixup(
           IDS_UPGRADE_ALREADY_UP_TO_DATE,
-          l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
           base::SysNSStringToUTF16(version));
 
       break;
 
     case kAutoupdateAvailable:
       imageID = IDR_UPDATE_AVAILABLE;
-      message = l10n_util::GetNSStringFWithFixup(
-          IDS_UPGRADE_AVAILABLE, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
+      message = l10n_util::GetNSStringWithFixup(IDS_UPGRADE_AVAILABLE);
       enableUpdateButton = true;
 
       break;
@@ -484,15 +482,13 @@ static BOOL recentShownUserActionFailedStatus = NO;
     case kAutoupdateInstalled:
       {
         imageID = IDR_UPDATE_UPTODATE;
-        string16 productName = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
         if (version) {
           message = l10n_util::GetNSStringFWithFixup(
               IDS_UPGRADE_SUCCESSFUL,
-              productName,
               base::SysNSStringToUTF16(version));
         } else {
-          message = l10n_util::GetNSStringFWithFixup(
-              IDS_UPGRADE_SUCCESSFUL_NOVERSION, productName);
+          message = l10n_util::GetNSStringWithFixup(
+              IDS_UPGRADE_SUCCESSFUL_NOVERSION);
         }
 
         // TODO(mark): Turn the button in the dialog into a restart button
diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc
index 7e966ff..eef92a7 100644
--- a/chrome/browser/ui/views/about_chrome_view.cc
+++ b/chrome/browser/ui/views/about_chrome_view.cc
@@ -718,7 +718,6 @@ void AboutChromeView::UpdateStatus(GoogleUpdateUpgradeResult result,
             UserMetricsAction("UpgradeCheck_AlreadyUpToDate"));
         string16 update_label_text = l10n_util::GetStringFUTF16(
             IDS_UPGRADE_ALREADY_UP_TO_DATE,
-            l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
             ASCIIToUTF16(version_info.Version()));
         if (base::i18n::IsRTL()) {
           update_label_text.push_back(
@@ -737,10 +736,8 @@ void AboutChromeView::UpdateStatus(GoogleUpdateUpgradeResult result,
       else
         content::RecordAction(UserMetricsAction("UpgradeCheck_Upgraded"));
       restart_button_visible_ = true;
-      const string16& update_string =
-          UTF16ToWide(l10n_util::GetStringFUTF16(
-              IDS_UPGRADE_SUCCESSFUL_RELAUNCH,
-              l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+      const string16& update_string = UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_UPGRADE_SUCCESSFUL_RELAUNCH));
       update_label_.SetText(update_string);
       show_success_indicator = true;
       break;
diff --git a/chrome/browser/ui/webui/about_page/about_page_handler.cc b/chrome/browser/ui/webui/about_page/about_page_handler.cc
index 2eaca13..8b7cfd8 100644
--- a/chrome/browser/ui/webui/about_page/about_page_handler.cc
+++ b/chrome/browser/ui/webui/about_page/about_page_handler.cc
@@ -361,8 +361,7 @@ void AboutPageHandler::UpdateStatus(
   switch (status.status) {
     case UpdateEngineClient::UPDATE_STATUS_IDLE:
       if (!sticky_) {
-        message = l10n_util::GetStringFUTF16(IDS_UPGRADE_ALREADY_UP_TO_DATE,
-            l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME));
+        message = l10n_util::GetStringUTF16(IDS_UPGRADE_ALREADY_UP_TO_DATE);
         enabled = true;
       }
       break;
diff --git a/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc b/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc
index 5491ef5..05223a9 100644
--- a/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc
@@ -346,8 +346,7 @@ void AboutPageHandler::UpdateStatus(
   switch (status.status) {
     case UpdateEngineClient::UPDATE_STATUS_IDLE:
       if (!sticky_) {
-        message = l10n_util::GetStringFUTF16(IDS_UPGRADE_ALREADY_UP_TO_DATE,
-            l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME));
+        message = l10n_util::GetStringUTF16(IDS_UPGRADE_ALREADY_UP_TO_DATE);
         enabled = true;
       }
       break;