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..3aa3c317f23bcd3c09723ddd4e0dca72075ed764 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -2208,29 +2208,55 @@ 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_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_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL" desc="Button text for canceling the downloads and closing the browser when one or more downloads are in progress. If necessary, add '#' for plural cases. [ICU Syntax]">
+      {NUM_DOWNLOAD, plural,
+        =1 {Cancel download and exit} other {Cancel downloads and exit}}
       </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_OK_BUTTON_LABEL" desc="Button text for canceling the downloads and closing 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}}

[jungshik at Google, 2015/05/01 23:18:51]

This string for button is still rather long for a button. We can consider
unifying this string with the corresponding non-incognito string
("Cancel download and exit")? 
The current string is 'Yes, exit incognito mode'. 

[jungshik at Google, 2015/05/04 19:27:44]

Moreover, in some languages, 'Incognito mode' is rather long. Germanic
languages, Malayalam and Spanish (both) are ok. (I missed Peter's comments about
them 
when uploading this PS). However, French, pt-PT and Greek (el) are problematic
along with a few other languages. 

In those languages, both the current string ("Yes, exit incognito mode") and a
proposed string (Cancel downloads and exit incognito mode) would be
too long for a button. The latter is even longer than the former. 

I've filed a bug on this issue (too long translation for 'incognito mode') at
http://crbug.com/484322

Anyway, I might as well leave those strings alone in this CL as suggested by
Peter because the primary purpose of this CL is to handle plural better. 


 

       </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_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_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
+      </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_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?
+      <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_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_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL" desc="In Title Case: Button text for canceling the downloads and closing the browser when one or more downloads are in progress. If necessary, add '#' for plural cases. [ICU Syntax]">
+      {NUM_DOWNLOAD, plural,
+        =1 {Cancel Download and Quit} other {Cancel Downloads and Quit}}
       </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 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,13 +11707,9 @@ 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_SINGLE"
-                 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
-        </message>
-        <message name="IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_MULTIPLE"
-                 desc="Title of recently closed windows in the recently closed section of the new tab page when the window has more than one tab. The % is replaced by the number of tabs">
-          <ph name="TAB_COUNT">$1<ex>3</ex></ph> Tabs
+        <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>
         <message name="IDS_NEW_TAB_TILE_GRID_ACCESSIBLE_DESCRIPTION"
                  desc="Help message for screenreader users, spoken when navigating to a tile grid for the first time.">
@@ -14914,22 +14936,20 @@ 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_DISCOVERY_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_DISCOVERY_NOTIFICATION_CONTENTS_PRINTER" desc="Contents of notification for one or more new printers showing up on your network. [ICU Syntax]">
+        {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">
+        <message name="IDS_LOCAL_DISCOVERY_SERVICE_NAME_PRINTER" desc="Display name for notification for a new printer showing up on your network">
           Google Cloud Print
         </message>
-        <message name="IDS_LOCAL_DISOCVERY_NOTIFICATION_BUTTON_PRINTER" desc="Message on registration button for printer">
+        <message name="IDS_LOCAL_DISCOVERY_NOTIFICATION_BUTTON_PRINTER" desc="Message on registration button for printer">
           Add to Cloud Print
         </message>
         <message name="IDS_LOCAL_DISCOVERY_DEVICES_PAGE_TITLE" desc="Title for devices page">