i18n of several browser messages

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 70666d9f63ef9a1f61540f3f07a9110c5226695e..1f65b6352d56fa4fd7bb8361a7ab8f80275bd31e 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -389,10 +389,10 @@ are declared in build/common.gypi.
         This site might try to trick you to steal your information (examples: passwords, messages, or credit cards).
       </message>
       <message name="IDS_WEBSITE_SETTINGS_FIRST_PARTY_SITE_DATA" desc="The label of the counts for allowed and blocked cookies and site data for the top-level origin (i.e. the origin in the Omnibox).">
-        <ph name="COUNT">$1<ex>6</ex></ph> from this site
+        {NUM_COOKIES, plural, =1 {1 from this site} other {# from this site}}
       </message>
       <message name="IDS_WEBSITE_SETTINGS_THIRD_PARTY_SITE_DATA" desc="The label of the counts for allowed and blocked third party cookies and site data.">
-        <ph name="COUNT">$1<ex>6</ex></ph> from other sites
+        {NUM_COOKIES, plural, =1 {1 from other sites} other {# from other sites}}
       </message>
       <message name="IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ALLOW" desc="The text of the menu item of a permissions menu on the Website Settings UI that resets the setting to the default setting which is allow.">
         Use global default (Allow)
@@ -8899,7 +8899,9 @@ I don't think this site should be blocked!
 
       <!-- Critical Notification Bubble -->
       <message name="IDS_CRITICAL_NOTIFICATION_HEADLINE" desc="The headline for the critical notification">
-        <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will restart in <ph name="SECONDS">$2<ex>10</ex></ph> seconds.
+        {1, plural,
+         =1 {<ph name="PRODUCT_NAME">{0}<ex>Google Chrome</ex></ph> will restart in 1 second.}

[Greg Levin, 2016/05/26 14:03:14]

** Presubmit Warnings **
Don't use PRODUCT_NAME placeholders in string resources. Instead, add separate
strings to google_chrome_strings.grd and chromium_strings.grd. See
http://goo.gl/6614MQ for more information.

The link doesn't say anything about needed to clean up existing cases.  Any
reason I shouldn't separate these as suggested anyway?

+         other {<ph name="PRODUCT_NAME">{0}<ex>Google Chrome</ex></ph> will restart in # seconds.}}
       </message>
       <message name="IDS_CRITICAL_NOTIFICATION_HEADLINE_ALTERNATE" desc="The headline for the critical notification when the countdown reaches 0 (will only be seen if an onbeforeunload handler on a web page cancels the shutdown sequence.">
         You should restart <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> now.