ubuntu-system-settings

Merge lp:~unity-api-team/ubuntu-system-settings/add-cellular-data-switch-string into lp:ubuntu-system-settings

  1. add-cellular-data-switch-string
  2. Merge into trunk
Proposed by Antti Kaijanmäki
Status: Merged
Approved by: Ken VanDine
Approved revision: 1640
Merged at revision: 1644
Proposed branch: lp:~unity-api-team/ubuntu-system-settings/add-cellular-data-switch-string
Merge into: lp:ubuntu-system-settings
Diff against target: 11 lines (+1/-0)
1 file modified
plugins/cellular/Components/DataMultiSim.qml (+1/-0)
To merge this branch: bzr merge lp:~unity-api-team/ubuntu-system-settings/add-cellular-data-switch-string
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ken VanDine Approve
Review via email: mp+293370@code.launchpad.net

Commit message

Add string for cellular data switch.

Description of the change

Add string for cellular data switch as per spec:
https://wiki.ubuntu.com/Networking#A.2BIBw-Cellular.2BIB0_settings

This MP does not change functionality.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1639
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2720/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6893
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/494
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/903
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5220
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6904
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6904/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28147

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

review: Needs Fixing (continuous-integration)
lp:~unity-api-team/ubuntu-system-settings/add-cellular-data-switch-string updated
1640. By Antti Kaijanmäki

revert .pot update

Revision history for this message
Ken VanDine (ken-vandine) wrote :

looks good

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1640
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2721/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6894/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/495
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/904
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5221/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6905
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6905/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28148

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/cellular/Components/DataMultiSim.qml'
2--- plugins/cellular/Components/DataMultiSim.qml 2015-08-10 13:31:45 +0000
3+++ plugins/cellular/Components/DataMultiSim.qml 2016-04-29 13:56:44 +0000
4@@ -27,6 +27,7 @@
5 property string prevOnlineModem: parent.prevOnlineModem
6
7 function getNameFromIndex (index) {
8+ var dummy = i18n.tr("Cellular data")
9 if (index === 0) {
10 return i18n.tr("Off");
11 } else if (index > 0) {

Subscribers

People subscribed via source and target branches