Fix ICU messages to make extractor happy

See go/icu-message-migration as to why this change is necessary.

Messages touched in this CL and other messages around them have other
issues. crbug.com/999781 was filed to address them.

Bug: 932220
Change-Id: Idb14aed70c53991c810f68bc3a5afe6981ae07df
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1493302
Commit-Queue: Jungshik Shin <jshin@chromium.org>
Reviewed-by: Balazs Engedy <engedy@chromium.org>
Reviewed-by: Ben Wells <benwells@chromium.org>
Reviewed-by: David Tseng <dtseng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694604}

chrome/browser/resources/chromeos/chromevox/strings/chromevox_strings.grd

@@ -1900,6 +1900,8 @@
       <message desc="In an editable text box, describes a line with only whitespace." name="IDS_CHROMEVOX_TEXT_BOX_WHITESPACE" meaning="UI element">
         Space
       </message>
+      <!-- TODO(crbug.com/999781): The following 3 messages are combined with other message fragments. -->
+      <!-- Combining message fragments is a I18N code-smell.  Combine fragments into a single message. -->
       <message desc="Further describes a list-like element with a number of items. e.g. This will be combined with other messages to produce: List with 3 items." name="IDS_CHROMEVOX_LIST_WITH_ITEMS_NOT_PLURALIZED">
         with <ph name="num">$1</ph> items
       </message>
@@ -1907,10 +1909,11 @@
         +<ph name="num">$1</ph>
       </message>
       <message desc="Further describes a list-like element with a number of items. e.g. This will be combined with other messages to produce: List with 3 items." name="IDS_CHROMEVOX_LIST_WITH_ITEMS">
-        with {COUNT, plural, =1 {# item}other {# items}}
+        {COUNT, plural, =1{with # item} other{with # items}}
       </message>
+      <!-- TODO(crbug.com/999781): This should not need ICU msg format. Fix where the message is used. -->
       <message desc="Further describes a list-like element with a number of items in braille." name="IDS_CHROMEVOX_LIST_WITH_ITEMS_BRL">
-        +{COUNT, plural, =1 {#}other {#}}
+        {COUNT, plural, =1{+#} other{+#}}
       </message>
       <message desc="Describes the state of a progress bar, in percent." name="IDS_CHROMEVOX_STATE_PERCENT">
         <ph name="num">$1</ph>%

components/page_info_strings.grdp

@@ -199,7 +199,7 @@
           Cookies <ph name="NUM_COOKIES">$1<ex>(4 in use)</ex></ph>
       </message>
       <message name="IDS_PAGE_INFO_NUM_COOKIES_PARENTHESIZED" desc="The label of the counts for allowed cookies that are in use on the page. This text will be used in IDS_PAGE_INFO_COOKIES_BUTTON_TEXT.">
-        ({NUM_COOKIES, plural, =1 {1 in use} other {# in use}})
+        {NUM_COOKIES, plural, =1 {(1 in use)} other {(# in use)}}
       </message>
       <message name="IDS_PAGE_INFO_COOKIES_TOOLTIP" desc="The text of the tooltip on IDS_PAGE_INFO_NUM_COOKIES_PARENTHESIZED.">
         Show cookies