summaryrefslogtreecommitdiffstats
path: root/res/values/strings.xml
diff options
context:
space:
mode:
authorBrian Muramatsu <btmura@google.com>2012-08-20 16:58:30 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-20 16:58:31 -0700
commite54660d8b66e5c3aebbeefbb727386602714c621 (patch)
treea827e250feb692c9ac75d78dc848f64e1567f1b7 /res/values/strings.xml
parent5fdc526426f6250bda522235a6db56548c89cb0a (diff)
parent0bd54a65d62d726dbdccab21bea96bf5eac83c0a (diff)
downloadpackages_apps_Settings-e54660d8b66e5c3aebbeefbb727386602714c621.zip
packages_apps_Settings-e54660d8b66e5c3aebbeefbb727386602714c621.tar.gz
packages_apps_Settings-e54660d8b66e5c3aebbeefbb727386602714c621.tar.bz2
Merge "display wireless charging status" into jb-mr1-dev
Diffstat (limited to 'res/values/strings.xml')
-rw-r--r--res/values/strings.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2cf5117..3db7edc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -176,8 +176,10 @@
<string name="battery_info_status_charging_ac">(AC)</string>
<!-- Battery Info screen. Units shown after a value. Used for diagnostic info screens, precise translation isn't needed -->
<string name="battery_info_status_charging_usb">(USB)</string>
+ <!-- Battery Info screen. Units shown after a value. Used for diagnostic info screens, precise translation isn't needed -->
+ <string name="battery_info_status_charging_wireless">(wireless)</string>
<!-- Battery Info screen. Value for a status item. Used for diagnostic info screens, precise translation isn't needed -->
- <string name="battery_info_status_discharging">Discharging</string>
+ <string name="battery_info_status_discharging">Not charging</string>
<!-- Battery Info screen. Value for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="battery_info_status_not_charging">Not charging</string>
<!-- Battery Info screen. Value for a status item. Used for diagnostic info screens, precise translation isn't needed -->
@@ -187,6 +189,7 @@
<string name="battery_info_power_unplugged">Unplugged</string>
<string name="battery_info_power_ac">AC</string>
<string name="battery_info_power_usb">USB</string>
+ <string name="battery_info_power_wireless">wireless</string>
<string name="battery_info_power_ac_usb">AC+USB</string>
<string name="battery_info_power_unknown">Unknown</string>