diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-06 21:14:06 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-06 21:14:06 +0000 |
| commit | 4fff0976b7e121af104487c9a0357bb15e74737f (patch) | |
| tree | 11b495163624a07eb675ebe10dda168fc69bb858 | |
| parent | 9e59a8452050fba027952aab4039c7e423cc287f (diff) | |
| download | chromium_src-4fff0976b7e121af104487c9a0357bb15e74737f.zip chromium_src-4fff0976b7e121af104487c9a0357bb15e74737f.tar.gz chromium_src-4fff0976b7e121af104487c9a0357bb15e74737f.tar.bz2 | |
Merge 204595 "cros: Update charging not reliable battery status"
> cros: Update charging not reliable battery status
>
> Don't display the "charging not reliable" battery status in the
> non-charging-non-discharging state, as that can happen normally in
> some circumstances. Also, update the string to be more human-friendly.
>
> BUG=246336
> TEST=manual, see bug
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=203952
>
> R=derat@chromium.org
>
> Review URL: https://codereview.chromium.org/16057022
TBR=jamescook@chromium.org
Review URL: https://codereview.chromium.org/16571006
git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@204597 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/ash_strings.grd | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd index ff576ed..eaf7adc 100644 --- a/ash/ash_strings.grd +++ b/ash/ash_strings.grd @@ -399,7 +399,7 @@ Press Shift + Alt to switch. <ph name="hour">$1<ex>2</ex></ph>:<ph name="minute">$2<ex>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."> - Charging not reliable + Low-power charger </message> <message name="IDS_ASH_STATUS_TRAY_BATTERY_FULL_CHARGE_ACCESSIBLE" desc="The message used by accessibility to show battery is full and charging."> Battery is full and charging. @@ -423,7 +423,7 @@ Press Shift + Alt to switch. <ph name="hour">$1<ex> 1 hour</ex></ph> and <ph name="minute">$2<ex>15 minutes</ex></ph> </message> <message name="IDS_ASH_STATUS_TRAY_BATTERY_CHARGING_UNRELIABLE_ACCESSIBLE" desc="The message used by accessibility to indicate that battery charging is unreliable."> - Plugged in to a non-standard power supply. Battery charging may not be reliable. + Plugged in to a low-power charger. Battery charging may not be reliable. </message> <message name="IDS_ASH_STATUS_TRAY_HELP" desc="The accessible text for the help button."> Help |