chrome/app/generated_resources.grd

Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 2298421f82397a447e13adbd847e4f59c3682f46..cff58abfa7becc9d3dda646365316b359f2f84b2 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -2208,29 +2208,50 @@ Even if you have downloaded files from this website before, the website might ha
       </if>
 
       <!-- Remove in-progress downloads confirmation dialog -->
-      <message name="IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_TITLE" desc="Title of the dialog asking for user confirmation to close the browser when one download is in progress.">
-        Download in progress
+      <if expr="not is_macosx">
+      <message name="IDS_DOWNLOAD_REMOVE_CONFIRM_TITLE" desc="Title of the dialog asking for user confirmation to close the browser when one or more downloads are in progress. If necessary, add '#' for plural cases. [ICU Syntax]">
+      {NUM_DOWNLOAD, plural,
+       =1 {Download in progress} other {Downloads in progress}}
       </message>
-      <message name="IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_TITLE" desc="Title of the dialog asking for user confirmation to close the browser when multiple downloads are in progress.">
-        Downloads in progress
+      <message name="IDS_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_TITLE" desc="Title of the dialog asking for user confirmation to close the last incognito window when one or more incognito downloads are in progress. If necessary, add '#' for plural cases. [ICU Syntax]">
+      {NUM_DOWNLOAD, plural,
+        =1 {Incognito download in progress} other {Incognito downloads in progress}}
       </message>
-      <message name="IDS_SINGLE_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_TITLE" desc="Title of the dialog asking for user confirmation to close the last incognito window when one incognito download is in progress.">
-        Incognito download in progress
+      <message name="IDS_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL" desc="Button text for OKing to close the last incognito window when one or more incognito downloads are in progress. If necessary, add '#' for plural cases. [ICU Syntax]">
+      {NUM_DOWNLOAD, plural,
+        =1 {Cancel download and exit incognito mode}

[Peter Kasting, 2015/05/01 21:11:28]

Again, I'm not sure we should change the string text to be noticeably longer.  I
wouldn't do this (or the "continue" case below) without UI OK.

[jungshik at Google, 2015/05/01 22:25:58]

I'll go back to strings 'seconded' by cleer@ (UX) and will ask for his approval.

+        other {Cancel downloads and exit incognito mode}}
       </message>
-      <message name="IDS_MULTIPLE_INCOGNITO_DOWNLOADS_REMOVE_CONFIRM_TITLE" desc="Title of the dialog asking for user confirmation to close the last incognito window when multiple incognito downloads are in progress.">
-        Incognito downloads in progress
+      <message name="IDS_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL" desc="Button text for canceling the closing of the browser or the last incognito window when one or more downloads are in progress. If necessary, add '#' for plural cases. [ICU Syntax]">
+      {NUM_DOWNLOAD, plural,
+        =1 {Continue download}
+        other {Continue downloads}}
       </message>
-      <message name="IDS_SINGLE_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION" desc="Explanation of the dialog asking for user confirmation to close the last incognito window when one incognito download is in progress.">
-        An incognito download is currently in progress. Do you want to exit incognito mode and cancel the download?
+      </if>
+      <if expr="is_macosx">
+      <message name="IDS_DOWNLOAD_REMOVE_CONFIRM_TITLE" desc="In Title Case: Title of the dialog asking for user confirmation to close the browser when one or more downloads are in progress. If necessary, add '#' for plural cases. [ICU Syntax]">
+      {NUM_DOWNLOAD, plural,
+       =1 {Download in Progress} other {Downloads in Progress}}
       </message>
-      <message name="IDS_MULTIPLE_INCOGNITO_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION" desc="Explanation of the dialog asking for user confirmation to close the last incognito window when multiple incognito downloads are in progress.">
-        Incognito downloads are currently in progress. Do you want to exit incognito mode and cancel the downloads?
+      <message name="IDS_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_TITLE" desc="In Title Case: Title of the dialog asking for user confirmation to close the last incognito window when one or more incognito downloads are in progress. If necessary, add '#' for plural cases. [ICU Syntax]">
+      {NUM_DOWNLOAD, plural,
+        =1 {Incognito Download in Progress} other {Incognito Downloads in Progress}}
       </message>
-      <message name="IDS_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL" desc="Button text for OKing to close the last incognito window when one or more incognito downloads are in progress.">
-        Yes, exit incognito mode
+      <message name="IDS_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL" desc="In Title Case: Button text for OKing to close the last incognito window when one or more incognito downloads are in progress. If necessary, add '#' for plural cases. [ICU Syntax]">
+      {NUM_DOWNLOAD, plural,
+        =1 {Cancel Download and Exit Incognito Mode}
+        other {Cancel Downloads and Exit Incognito Mode}}
       </message>
-      <message name="IDS_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL" desc="Button text for canceling the closing of the browser or the last incognito window when one or more downloads are in progress.">
-        No
+      <message name="IDS_DOWNLOAD_REMOVE_CONFIRM_CANCEL_BUTTON_LABEL" desc="Button text for canceling the closing of the browser or the last incognito window when one or more downloads are in progress. If necessary, add '#' for plural cases. [ICU Syntax]">
+      {NUM_DOWNLOAD, plural,
+        =1 {Continue the download}
+        other {Continue downloads}}
+      </message>
+      </if>
+      <message name="IDS_INCOGNITO_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION" desc="Explanation of the dialog asking for user confirmation to close the last incognito window when one incognito download is in progress. [ICU Syntax]">
+      {NUM_DOWNLOAD, plural,
+        =1 {A download is currently in progress. Do you want to cancel the download and exit incognito mode?}
+        other {# downloads are currently in progress. Do you want to cancel the downloads and exit incognito mode?}}
       </message>
 
       <!-- Dialog that asks whether user wants to participate in Safe Browsing Extended Reporting -->
@@ -11681,6 +11702,13 @@ Chrome ran out of memory.
             Pages you view in this window won’t appear in the browser history and they won’t leave other traces, like cookies, on the computer after you close all open Guest windows. Any files you download will be preserved, however.
           </message>
         </if>
+        <message name="IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW"
+                 desc="Title of recently closed windows in Recent Tabs menu. [ICU_Syntax]">
+          {NUM_TABS, plural, =1 {1 Tab} other {# Tabs}}
+        </message>
+        <!-- TODO(jungshik): Get rid of the following two strings when webUI
+             can use ICU syntax (bug 481718). These strings may not be used
+             at all, in which case we can just remove them. -->
         <message name="IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_SINGLE"

[jungshik at Google, 2015/05/01 20:28:34]

IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_SINGLE and
IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_MULTIPLE are used in recently_closed.js, but
we got rid of 'recent tabs' menu in NTP in 2013. So, we may not need these
strings any more. 

                  desc="Title of recently closed windows in the recently closed section of the new tab page when the window has a single tab">
           1 Tab
@@ -14914,17 +14942,15 @@ After you create a new supervised user, you can manage their settings at any tim
         <message name="IDS_LOCAL_DISCOVERY_MANAGE_DEVICE" desc="Name for button to manage registered device">
           Manage
         </message>
-        <message name="IDS_LOCAL_DISOCVERY_NOTIFICATION_TITLE_PRINTER" desc="Title of notification for a new printer showing up on your network">
-          New printer on your network
-        </message>
-        <message name="IDS_LOCAL_DISOCVERY_NOTIFICATION_CONTENTS_PRINTER" desc="Contents of notification for a new printer showing up on your network">
-          Add the printer to Google Cloud Print so you can print from anywhere.
-        </message>
-        <message name="IDS_LOCAL_DISOCVERY_NOTIFICATION_TITLE_PRINTER_MULTIPLE" desc="Title of notification for a new printer showing up on your network">
-        New printers on your network
+        <message name="IDS_LOCAL_DISOCVERY_NOTIFICATION_TITLE_PRINTER" desc="Title of notification for one or more new printer showing up on your network. [ICU Syntax]">
+        {NUM_PRINTER, plural,
+         =1 {New printer on your network}
+         other {New printers on your network}}
         </message>
-        <message name="IDS_LOCAL_DISOCVERY_NOTIFICATION_CONTENTS_PRINTER_MULTIPLE" desc="Contents of notification for a new printer showing up on your network">
-          Add the printers to Google Cloud Print so you can print from anywhere.
+        <message name="IDS_LOCAL_DISOCVERY_NOTIFICATION_CONTENTS_PRINTER" desc="Contents of notification for one or more new printers showing up on your network. [ICU Syntax]">

[Avi (use Gerrit), 2015/05/01 21:02:18]

While you're in here can you fix all the "DISOCVERY" typos to "DISCOVERY"? Or
would that ripple all over the place?

(At least fix it for the messages we're altering.)

[jungshik at Google, 2015/05/01 22:25:58]

Ok. I'll do. 

+        {NUM_PRINTER, plural,
+          =1 {Add the printer to Google Cloud Print so you can print from anywhere.}
+          other {Add # printers to Google Cloud Print so you can print from anywhere.}}
         </message>
         <message name="IDS_LOCAL_DISOCVERY_SERVICE_NAME_PRINTER" desc="Display name for notification for a new printer showing up on your network">
           Google Cloud Print