Merge lp:~seb128/ubuntu-system-settings/battery-non-colored-icon into lp:ubuntu-system-settings

[Sebastien Bacher]

[battery] don't use a colored icon

[battery] don't use a colored icon

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1164
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1716/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6348
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/908
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5950
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7600
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7600/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3600
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4636
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4636/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1716/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Thanks!

review: Approve

=== modified file 'plugins/battery/battery.settings'
--- plugins/battery/battery.settings	2014-09-24 17:10:03 +0000
+++ plugins/battery/battery.settings	2014-10-31 08:49:27 +0000
@@ -1,6 +1,6 @@
 {
     "plugin": "battery-plugin",
-    "icon": "battery-080-charging",
+    "icon": "battery-080",
     "name": "Battery",
     "translations": "ubuntu-system-settings",
     "category": "system",