Merge lp:~jonas-drange/ubuntu-system-settings/wifi-other-network-label-fix-1365984 into lp:ubuntu-system-settings

[Jonas G. Drange]

[wifi] "Other Network" -> "Connect to hidden network"

[wifi] "Other Network" -> "Connect to hidden network"

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1020
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1446/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4688/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3457
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/638
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4471/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5940
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5940/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13028
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2862
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3762
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3762/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/wifi-other-network-label-fix-1365984]

1021. By Jonas G. Drange on 2014-09-11

merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1021
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1455/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4729/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3477
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/647
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4509/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5981
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5981/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13080
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2878
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3782
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3782/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

[Adolfo Jayme Barrientos (fitojb)]

The POT file wasn’t updated...

=== modified file 'plugins/wifi/OtherNetwork.qml'
--- plugins/wifi/OtherNetwork.qml	2014-09-10 13:07:31 +0000
+++ plugins/wifi/OtherNetwork.qml	2014-09-11 14:16:40 +0000
@@ -24,7 +24,7 @@
 
 ItemPage {
     id: othernetwork
-    title: i18n.tr("Other network")
+    title: i18n.tr("Connect to hidden network")
 
     function settingsValid() {
         if(networkname.length == 0) {

=== modified file 'plugins/wifi/PageComponent.qml'
--- plugins/wifi/PageComponent.qml	2014-06-23 08:16:41 +0000
+++ plugins/wifi/PageComponent.qml	2014-09-11 14:16:40 +0000
@@ -117,7 +117,7 @@
             }
 
             ListItem.SingleValue {
-                text: i18n.tr("Other network")
+                text: i18n.tr("Connect to hidden network")
                 progression: true
                 onClicked: pageStack.push(Qt.resolvedUrl("OtherNetwork.qml"))
             }