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

BUG=NONE
TEST=NONE


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

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

7 files changed, 62 insertions, 49 deletions

diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index f2b1347..8663e14 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -502,6 +502,26 @@ Chromium is unable to recover your settings.
         Chromium does not include the PDF viewer which is required for Print Preview to function.
       </message>
 
+      <!-- Download Shelf Items -->
+      <message name="IDS_DOWNLOAD_STATUS_CRX_INSTALL_RUNNING"
+               desc="Message shown when a CRX has been downloaded and is being unpacked.">
+        Adding to Chromium...
+      </message>
+
+      <!-- Remove in-progress downloads confirmation dialog -->
+      <message name="IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_WARNING" desc="Title of the dialog asking for user confirmation to close the browser when one download is in-progress.">
+        Do you want to exit Chromium with a download in progress?
+      </message>
+      <message name="IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_WARNING" desc="Title of the dialog asking for user confirmation to close the browser when multiple downloads are in-progress.">
+        Do you want to exit Chromium with <ph name="DOWNLOAD_COUNT">$1<ex>3</ex></ph> downloads in progress?
+      </message>
+      <message name="IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION" desc="Explanation of the dialog asking for user confirmation to close the browser when one download is in-progress.">
+        If you close Chromium now, this download will be canceled.
+      </message>
+      <message name="IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION" desc="Explanation of the dialog asking for user confirmation to close the browser when multiple downloads are in-progress.">
+        If you close Chromium now, these downloads will be canceled.
+      </message>
+
       <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 f7ed024..f60c16c 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -2324,10 +2324,6 @@ are declared in build/common.gypi.
                desc="Time left until the file download completes and the file is opened.">
         Opening in <ph name="TIME_REMAINING">$1<ex>5 sec</ex></ph>...
       </message>
-      <message name="IDS_DOWNLOAD_STATUS_CRX_INSTALL_RUNNING"
-               desc="Message shown when a CRX has been downloaded and is being unpacked.">
-        Adding to <ph name="PRODUCT_NAME_SHORT">$1<ex>Chrome</ex></ph>...
-      </message>
       <message name="IDS_DOWNLOAD_STATUS_OPEN_WHEN_COMPLETE"
          desc="Status that the file download will be opened when the download completes.">
         Opening when complete
@@ -2567,18 +2563,6 @@ are declared in build/common.gypi.
       </if>
 
       <!-- Remove in-progress downloads confirmation dialog -->
-      <message name="IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_WARNING" desc="Title of the dialog asking for user confirmation to close the browser when one download is in-progress.">
-        Do you want to exit <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> with a download in progress?
-      </message>
-      <message name="IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_WARNING" desc="Title of the dialog asking for user confirmation to close the browser when multiple downloads are in-progress.">
-        Do you want to exit <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> with <ph name="DOWNLOAD_COUNT">$2<ex>3</ex></ph> downloads in progress?
-      </message>
-      <message name="IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION" desc="Explanation of the dialog asking for user confirmation to close the browser when one download is in-progress.">
-        If you close <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> now, this download will be canceled.
-      </message>
-      <message name="IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION" desc="Explanation of the dialog asking for user confirmation to close the browser when multiple downloads are in-progress.">
-        If you close <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> now, these downloads will be canceled.
-      </message>
       <message name="IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL" desc="Button text for OKing to close the browser when a single download is in-progress.">
         Close and cancel download
       </message>
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index 7527754..165d9dfa 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -477,6 +477,26 @@ Google Chrome is unable to recover your settings.
         Google Chrome cannot show the print preview when the built-in PDF viewer is disabled. In order to see the preview, please visit <ph name="BEGIN_LINK">&lt;a target="_blank" rel="noreferrer" href="$1"&gt;</ph>$1<ph name="END_LINK">&lt;/a&gt;</ph>, enable the "Chrome PDF Viewer", and try again.
       </message>
 
+      <!-- Download Shelf Items -->
+      <message name="IDS_DOWNLOAD_STATUS_CRX_INSTALL_RUNNING"
+               desc="Message shown when a CRX has been downloaded and is being unpacked.">
+        Adding to Chrome...
+      </message>
+
+      <!-- Remove in-progress downloads confirmation dialog -->
+      <message name="IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_WARNING" desc="Title of the dialog asking for user confirmation to close the browser when one download is in-progress.">
+        Do you want to exit Google Chrome with a download in progress?
+      </message>
+      <message name="IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_WARNING" desc="Title of the dialog asking for user confirmation to close the browser when multiple downloads are in-progress.">
+        Do you want to exit Google Chrome with <ph name="DOWNLOAD_COUNT">$1<ex>3</ex></ph> downloads in progress?
+      </message>
+      <message name="IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION" desc="Explanation of the dialog asking for user confirmation to close the browser when one download is in-progress.">
+        If you close Google Chrome now, this download will be canceled.
+      </message>
+      <message name="IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION" desc="Explanation of the dialog asking for user confirmation to close the browser when multiple downloads are in-progress.">
+        If you close Google Chrome now, these downloads will be canceled.
+      </message>
+
       <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/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 2b77a92..cf82cba 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -607,15 +607,13 @@ const AEEventClass kAECloudPrintUninstallClass = 'GCPu';
   NSString* waitTitle = nil;
   NSString* exitTitle = nil;
 
-  string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
-
   // Set the dialog text based on whether or not there are multiple downloads.
   if (downloadCount == 1) {
     // Dialog text: warning and explanation.
-    warningText = l10n_util::GetNSStringF(
-        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_WARNING, product_name);
-    explanationText = l10n_util::GetNSStringF(
-        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION, product_name);
+    warningText = l10n_util::GetNSString(
+        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_WARNING);
+    explanationText = l10n_util::GetNSString(
+        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION);
 
     // Cancel download and exit button text.
     exitTitle = l10n_util::GetNSString(
@@ -627,10 +625,10 @@ const AEEventClass kAECloudPrintUninstallClass = 'GCPu';
   } else {
     // Dialog text: warning and explanation.
     warningText = l10n_util::GetNSStringF(
-        IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_WARNING, product_name,
+        IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_WARNING,
         base::IntToString16(downloadCount));
-    explanationText = l10n_util::GetNSStringF(
-        IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION, product_name);
+    explanationText = l10n_util::GetNSString(
+        IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION);
 
     // Cancel downloads and exit button text.
     exitTitle = l10n_util::GetNSString(
diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc
index 01b3ddd..c9e2a0f 100644
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.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.
 
@@ -64,9 +64,8 @@ string16 DownloadItemModel::GetStatusText() {
           download_->GetState() == DownloadItem::IN_PROGRESS) {
         // The download is a CRX (app, extension, theme, ...) and it is
         // being unpacked and validated.
-        status_text = l10n_util::GetStringFUTF16(
-            IDS_DOWNLOAD_STATUS_CRX_INSTALL_RUNNING,
-            l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
+        status_text = l10n_util::GetStringUTF16(
+            IDS_DOWNLOAD_STATUS_CRX_INSTALL_RUNNING);
       } else if (download_->GetOpenWhenComplete()) {
         if (simple_time.empty()) {
           status_text =
diff --git a/chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.cc b/chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.cc
index 3022c09..e47e6c5 100644
--- a/chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.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.
 
@@ -38,15 +38,12 @@ DownloadInProgressDialogGtk::DownloadInProgressDialogGtk(Browser* browser)
   std::string explanation_text;
   std::string ok_button_text;
   std::string cancel_button_text;
-  string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
   if (download_count == 1) {
     warning_text =
-        l10n_util::GetStringFUTF8(IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_WARNING,
-                                  product_name);
+        l10n_util::GetStringUTF8(IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_WARNING);
     explanation_text =
-        l10n_util::GetStringFUTF8(
-            IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION,
-            product_name);
+        l10n_util::GetStringUTF8(
+            IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION);
     ok_button_text = l10n_util::GetStringUTF8(
         IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL);
     cancel_button_text = l10n_util::GetStringUTF8(
@@ -54,11 +51,10 @@ DownloadInProgressDialogGtk::DownloadInProgressDialogGtk(Browser* browser)
   } else {
     warning_text =
         l10n_util::GetStringFUTF8(IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_WARNING,
-                                  product_name,
                                   base::IntToString16(download_count));
     explanation_text =
-        l10n_util::GetStringFUTF8(
-            IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION, product_name);
+        l10n_util::GetStringUTF8(
+            IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION);
     ok_button_text = l10n_util::GetStringUTF8(
         IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_OK_BUTTON_LABEL);
     cancel_button_text = l10n_util::GetStringUTF8(
diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
index dd3bc48..961e21f 100644
--- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
+++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc
@@ -43,12 +43,10 @@ DownloadInProgressDialogView::DownloadInProgressDialogView(Browser* browser)
   string16 warning_text;
   string16 explanation_text;
   if (download_count == 1) {
-    warning_text = l10n_util::GetStringFUTF16(
-        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_WARNING,
-        product_name_);
-    explanation_text = l10n_util::GetStringFUTF16(
-        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION,
-        product_name_);
+    warning_text = l10n_util::GetStringUTF16(
+        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_WARNING);
+    explanation_text = l10n_util::GetStringUTF16(
+        IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION);
     ok_button_text_ = l10n_util::GetStringUTF16(
         IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL);
     cancel_button_text_ = l10n_util::GetStringUTF16(
@@ -56,11 +54,9 @@ DownloadInProgressDialogView::DownloadInProgressDialogView(Browser* browser)
   } else {
     warning_text = l10n_util::GetStringFUTF16(
         IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_WARNING,
-        product_name_,
         UTF8ToUTF16(base::IntToString(download_count)));
-    explanation_text = l10n_util::GetStringFUTF16(
-        IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION,
-        product_name_);
+    explanation_text = l10n_util::GetStringUTF16(
+        IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION);
     ok_button_text_ = l10n_util::GetStringUTF16(
         IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_OK_BUTTON_LABEL);
     cancel_button_text_ = l10n_util::GetStringUTF16(