Fix i18n number formats in tray power displays

ash/ash_chromeos_strings.grdp

 <?xml version="1.0" encoding="utf-8"?>
 <!-- ChromeOS-specific strings (included from ash_strings.grd).
      Everything in this file is wrapped in <if expr="chromeos">. -->
 <grit-part>
 
   <!-- Device types -->
   <message name="IDS_ASH_CHROMEBASE" desc="The device name for a Chromebase (versus say Chromebox)">
     Chromebase
   </message>
   <message name="IDS_ASH_CHROMEBIT" desc="The device name for a Chromebit (versus say Chromebox)">
@@ skipping 344 matching lines @@
 Press Shift + Alt to switch.
   </message>
   <message name="IDS_ASH_STATUS_TRAY_THIRD_PARTY_IME_TURNED_ON_BUBBLE" desc="The message shown on a bubble when a third party IME is enabled">
     Your input method has changed to <ph name="INPUT_METHOD_ID">$1<ex>EN</ex></ph>*(<ph name="BEGIN_LINK">&lt;a target="_blank" href="$2"&gt;</ph>3rd party<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>).
 Press Shift + Alt to switch.
   </message>
   <message name="IDS_ASH_STATUS_TRAY_BATTERY_FULL" desc="The label in the tray dialog to indicate that the battery is full.">
     Battery full
   </message>
   <message name="IDS_ASH_STATUS_TRAY_BATTERY_PERCENT" desc="The label in the tray dialog to show the remaining battery power as a percent.">
-    <ph name="percentage">$1<ex>56</ex></ph>% remaining
-  </message>
-  <message name="IDS_ASH_STATUS_TRAY_BATTERY_PERCENT_ONLY" desc="The label in the tray bubble setting row to show the remaining battery power as a percent.">
-    <ph name="percentage">$1<ex>56</ex></ph>%
+    <ph name="percentage">$1<ex>56%</ex></ph> remaining
   </message>
   <message name="IDS_ASH_STATUS_TRAY_BATTERY_TIME_UNTIL_FULL" desc="The label in the tray dialog to show a time estimate until the battery is fully charged.">
-    <ph name="hour">$1<ex>2</ex></ph>h <ph name="minute">$2<ex>53</ex></ph>m until full
+    <ph name="time">$1<ex>2h 53m</ex></ph> until full
   </message>
   <message name="IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING" desc="The label in the tray dialog indicating that the time to charge or discharge the battery is being calculated.">
     Calculating...
   </message>
   <message name="IDS_ASH_STATUS_TRAY_BATTERY_TIME_LEFT_SHORT" desc="The label in the tray bubble settings row to show a time estimate until the battery is empty.">
-    <ph name="hour">$1<ex>2</ex></ph>:<ph name="minute">$2<ex>53</ex></ph> left
+    <ph name="time">$1<ex>2:53</ex></ph> left
   </message>
   <message name="IDS_ASH_STATUS_TRAY_BATTERY_TIME_UNTIL_FULL_SHORT" desc="The label in the tray bubble settings row to show a time estimate until the battery is fully charged.">
-    <ph name="hour">$1<ex>2</ex></ph>:<ph name="minute">$2<ex>53</ex></ph> until full
+    <ph name="time">$1<ex>2:53</ex></ph> until full
   </message>
   <message name="IDS_ASH_STATUS_TRAY_BATTERY_CHARGING_UNRELIABLE" desc="The label in the tray dialog to indicate that battery charging is unreliable.">
     Low-power charger
   </message>
   <message name="IDS_ASH_STATUS_TRAY_BATTERY_FULL_CHARGE_ACCESSIBLE" desc="The message used by accessibility to show battery is fully charged.">
     Battery is full.
   </message>
   <message name="IDS_ASH_STATUS_TRAY_BATTERY_PERCENT_ACCESSIBLE" desc="The message used by accessibility to show battery is discharging.">
     Battery is <ph name="percentage">$1<ex>56</ex></ph>% full.
   </message>
@@ skipping 123 matching lines @@
   </message>
   <message name="IDS_DEPRECATED_SHOW_TASK_MANAGER_MSG"
            desc="Notification message to tell users about the deprecation of Shift+ESC shortcut to show the task manager.">
     The shortcut to open the task manager has changed. Please use <ph name="NEW_SHORTCUT">$1<ex>Search+Esc</ex></ph> instead of <ph name="OLD_SHORTCUT">$2<ex>Shift+Esc</ex></ph>.
   </message>
   <message name="IDS_DEPRECATED_NEXT_IME_MSG"
            desc="Notification message to tell users about the deprecation of Shift+Alt shortcut to switch to the next input method.">
     The shortcut to switch to the next input method has changed. Please use <ph name="NEW_SHORTCUT">$1<ex>Ctrl+Shift+Space</ex></ph> instead of <ph name="OLD_SHORTCUT">$2<ex>Shift+Alt</ex></ph>.
   </message>
 </grit-part>