Merge lp:~ken-vandine/ubuntu-system-settings/lp1534221 into lp:ubuntu-system-settings

[Ken VanDine]

Return "Phone" for type Smartphone

Return "Phone" for type Smartphone

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1584
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2574/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6032
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/348
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/757
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4659
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6043
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6043/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26667

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

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

Pat has tested this, the test failures are not introduced by this branch, and the code looks good! Thanks.

review: Approve

[lp:~ken-vandine/ubuntu-system-settings/lp1534221]

1585. By Ken VanDine on 2016-01-29

merged trunk

1586. By Ken VanDine on 2016-01-29

merged trunk

=== modified file 'plugins/bluetooth/DevicePage.qml'
--- plugins/bluetooth/DevicePage.qml	2016-01-28 14:20:04 +0000
+++ plugins/bluetooth/DevicePage.qml	2016-01-29 15:41:24 +0000
@@ -45,6 +45,7 @@
     function getTypeString(type) {
         switch (type) {
         case Device.Computer:   return i18n.tr("Computer");
+        case Device.Smartphone: return i18n.tr("Phone");
         case Device.Phone:      return i18n.tr("Phone");
         case Device.Modem:      return i18n.tr("Modem");
         case Device.Network:    return i18n.tr("Network");