Merge lp:~cyphermox/ubuntu-system-settings/providePinCode into lp:ubuntu-system-settings/rtm-14.09

[Mathieu Trudel-Lapierre]

Fix the PIN code handling for bluetooth device authentication.

Fix the PIN code handling for bluetooth device authentication.

[Sebastien Bacher (seb128)]

Thanks, that merge request includes more changes. Trunk of u-s-s is also focussed on rtm, we should probably not even have a branch there but just have on vcs and pocket copy between series

review: Needs Fixing

[Sebastien Bacher (seb128)]

rejecting since we don't use a specific rtm serie

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-19 15:26:56 +0000
+++ debian/changelog	2014-08-26 21:07:36 +0000
@@ -1,3 +1,36 @@
+ubuntu-system-settings (0.3+14.10.20140825-0ubuntu1) utopic; urgency=low
+
+  [ Ken VanDine ]
+  * Added autopilot tests for security-privacy
+
+  [ jonas-drange ]
+  * [phone] adding dual sim functionality to phone panel
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 25 Aug 2014 15:19:31 +0000
+
+ubuntu-system-settings (0.3+14.10.20140822.1-0ubuntu1) utopic; urgency=low
+
+  [ Charles Kerr ]
+  * In the welcome wizard, refresh the text in the 'no sim card' and
+    'all done' pages to match the latest from design.
+
+  [ Michael Terry ]
+  * Add a location page and a terms and conditions page for the HERE
+    service.
+
+  [ Ken VanDine ]
+  * Settings for idle/lock timeout (LP: #1230345)
+  * Added flickable to fix scrolling (LP: #1354161)
+
+  [ Jussi Pakkanen ]
+  * Fix a bunch of compiler warnings.
+
+  [ jonas-drange ]
+  * [cellular] displays cellular UIs based on how many SIMs are present.
+    (LP: #1357393)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 22 Aug 2014 18:57:00 +0000
+
 ubuntu-system-settings (0.3+14.10.20140819.1-0ubuntu1) utopic; urgency=low
 
   [ Sebastien Bacher ]

=== modified file 'debian/control'
--- debian/control	2014-08-19 14:56:31 +0000
+++ debian/control	2014-08-26 21:07:36 +0000
@@ -56,7 +56,7 @@
          bluez (>= 4.36),
          dbus-property-service [amd64 armhf i386],
          gsettings-desktop-schemas,
-         gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140813),
+         gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
          indicator-bluetooth (>> 0.0.6+13.10.20131010),
          indicator-network (>= 0.5.0+13.10.20130918),
          powerd (>= 0.15) | gnome-settings-daemon,

=== modified file 'plugins/about/storageabout.cpp'
--- plugins/about/storageabout.cpp	2014-07-24 10:57:43 +0000
+++ plugins/about/storageabout.cpp	2014-08-26 21:07:36 +0000
@@ -60,7 +60,7 @@
                          GAsyncReadyCallback callback,
                          gpointer user_data)
 {
-    MeasureData *data = (MeasureData *) user_data;
+    auto *data = static_cast<MeasureData *>(user_data);
 
     GFile *file = g_file_new_for_path (filename);
 
@@ -103,7 +103,7 @@
     GError *err = NULL;
     GFile *file = G_FILE (source_object);
 
-    MeasureData *data = (MeasureData *) user_data;
+    auto data = static_cast<MeasureData *>(user_data);
 
     guint64 *size = (guint64 *) data->size;
 
@@ -137,6 +137,11 @@
     QObject(parent),
     m_clickModel(),
     m_clickFilterProxy(&m_clickModel),
+    m_moviesSize(0),
+    m_audioSize(0),
+    m_picturesSize(0),
+    m_otherSize(0),
+    m_homeSize(0),
     m_propertyService(new QDBusInterface(PROPERTY_SERVICE_OBJ,
         PROPERTY_SERVICE_PATH,
         PROPERTY_SERVICE_OBJ,
@@ -147,10 +152,10 @@
 
 QString StorageAbout::serialNumber()
 {
-    static char serialBuffer[PROP_NAME_MAX];
 
     if (m_serialNumber.isEmpty() || m_serialNumber.isNull())
     {
+        char serialBuffer[PROP_VALUE_MAX];
         property_get("ro.serialno", serialBuffer, "");
         m_serialNumber = QString(serialBuffer);
     }
@@ -160,11 +165,10 @@
 
 QString StorageAbout::vendorString()
 {
-    static char manufacturerBuffer[PROP_NAME_MAX];
-    static char modelBuffer[PROP_NAME_MAX];
-
     if (m_vendorString.isEmpty() || m_vendorString.isNull())
     {
+        char manufacturerBuffer[PROP_VALUE_MAX];
+        char modelBuffer[PROP_VALUE_MAX];
         property_get("ro.product.manufacturer", manufacturerBuffer, "");
         property_get("ro.product.model", modelBuffer, "");
         m_vendorString = QString("%1 %2").arg(manufacturerBuffer).arg(modelBuffer);
@@ -175,10 +179,10 @@
 
 QString StorageAbout::deviceBuildDisplayID()
 {
-    static char serialBuffer[PROP_NAME_MAX];
 
     if (m_deviceBuildDisplayID.isEmpty() || m_deviceBuildDisplayID.isNull())
     {
+        char serialBuffer[PROP_VALUE_MAX];
         property_get("ro.build.display.id", serialBuffer, "");
         m_deviceBuildDisplayID = QString(serialBuffer);
     }

=== modified file 'plugins/battery/PageComponent.qml'
--- plugins/battery/PageComponent.qml	2014-08-12 19:22:39 +0000
+++ plugins/battery/PageComponent.qml	2014-08-26 21:07:36 +0000
@@ -57,7 +57,7 @@
 
     GSettings {
         id: powerSettings
-        schema.id: batteryBackend.powerdRunning ? "com.canonical.powerd" : "org.gnome.desktop.session"
+        schema.id: batteryBackend.powerdRunning ? "com.ubuntu.touch.system" : "org.gnome.desktop.session"
     }
 
     UbuntuSecurityPrivacyPanel {
@@ -322,7 +322,6 @@
                 onClicked: pageStack.push(
                                Qt.resolvedUrl("SleepValues.qml"),
                                { title: text, lockOnSuspend: lockOnSuspend })
-                visible: showAllUI // TODO: re-enable once bug #1230345 is resolved
             }
             ListItem.Standard {
                 text: i18n.tr("Wi-Fi")

=== modified file 'plugins/battery/SleepValues.qml'
--- plugins/battery/SleepValues.qml	2013-09-30 16:48:16 +0000
+++ plugins/battery/SleepValues.qml	2014-08-26 21:07:36 +0000
@@ -31,11 +31,12 @@
 
 ItemPage {
     id: root
-
+    objectName: "sleepValues"
     flickable: scrollWidget
 
     property alias usePowerd: batteryBackend.powerdRunning
     property bool lockOnSuspend
+    property variant idleValues: [60,120,180,240,300,600]
 
     UbuntuBatteryPanel {
         id: batteryBackend
@@ -43,19 +44,20 @@
 
     GSettings {
         id: powerSettings
-        schema.id: usePowerd ? "com.canonical.powerd" : "org.gnome.desktop.session"
+        schema.id: usePowerd ? "com.ubuntu.touch.system" : "org.gnome.desktop.session"
         onChanged: {
             if (key == "activityTimeout" || key == "idleDelay")
-                if([60,120,180,240,300].indexOf(value) != -1)
-                    sleepSelector.selectedIndex = (value/60)-1
+                var curIndex = idleValues.indexOf(value)
+                if( curIndex != -1)
+                    sleepSelector.selectedIndex = curIndex
                 else if(value === 0)
-                    sleepSelector.selectedIndex = 5
+                    sleepSelector.selectedIndex = 6
         }
         Component.onCompleted: {
             if (usePowerd)
-                sleepSelector.selectedIndex = (powerSettings.activityTimeout === 0) ? 5 : powerSettings.activityTimeout/60-1
+                sleepSelector.selectedIndex = (powerSettings.activityTimeout === 0) ? 6 : idleValues.indexOf(powerSettings.activityTimeout)
             else
-                sleepSelector.selectedIndex = (powerSettings.idleDelay === 0) ? 5 : powerSettings.idleDelay/60-1
+                sleepSelector.selectedIndex = (powerSettings.idleDelay === 0) ? 6 : idleValues.indexOf(powerSettings.idleDelay)
         }
     }
 
@@ -71,7 +73,11 @@
 
             ListItem.ItemSelector {
                 id: sleepSelector
+                objectName: "sleepSelector"
                 text: lockOnSuspend ? i18n.tr("Lock the phone when it's not in use:") : i18n.tr("Put the phone to sleep when it is not in use:")
+                delegate: OptionSelectorDelegate {
+                    text: modelData
+                }
                 model: [
                     // TRANSLATORS: %1 is the number of minutes
                     i18n.tr("After %1 minute",
@@ -93,13 +99,17 @@
                     i18n.tr("After %1 minute",
                             "After %1 minutes",
                             5).arg(5),
+                    // TRANSLATORS: %1 is the number of minutes
+                    i18n.tr("After %1 minute",
+                            "After %1 minutes",
+                            10).arg(10),
                     i18n.tr("Never")]
                 expanded: true
                 onDelegateClicked: {
                   if (usePowerd)
-                    powerSettings.activityTimeout = (index == 5) ? 0 : (index+1)*60
+                    powerSettings.activityTimeout = (index == 6) ? 0 : idleValues[index]
                   else
-                    powerSettings.idleDelay = (index == 5) ? 0 : (index+1)*60
+                    powerSettings.idleDelay = (index == 6) ? 0 : idleValues[index]
                 }
             }
 

=== modified file 'plugins/battery/battery.cpp'
--- plugins/battery/battery.cpp	2013-09-30 11:09:29 +0000
+++ plugins/battery/battery.cpp	2014-08-26 21:07:36 +0000
@@ -28,7 +28,7 @@
                                       GParamSpec *pspec G_GNUC_UNUSED,
                                       gpointer user_data)
 {
-    Battery * object = (Battery *) user_data;
+    auto object = static_cast<Battery *>(user_data);
 
     Q_EMIT (object->wifiEnabledChanged());
 }
@@ -65,7 +65,6 @@
     UpClient *client;
     gboolean returnIsOk;
     GPtrArray *devices;
-    UpDevice *device;
     UpDeviceKind kind;
 
     client = up_client_new();
@@ -77,6 +76,7 @@
     devices = up_client_get_devices(client);
 
     for (uint i=0; i < devices->len; i++) {
+        UpDevice *device;
         device = (UpDevice *)g_ptr_array_index(devices, i);
         g_object_get(device, "kind", &kind, NULL);
         if (kind == UP_DEVICE_KIND_BATTERY) {
@@ -111,7 +111,6 @@
 
 void Battery::getLastFullCharge()
 {
-    UpHistoryItem *item;
     GPtrArray *values = NULL;
     gint32 offset = 0;
     GTimeVal timeval;
@@ -130,7 +129,7 @@
     g_object_get (m_device, "capacity", &maxCapacity, NULL);
 
     for (uint i=0; i < values->len; i++) {
-        item = (UpHistoryItem *) g_ptr_array_index(values, i);
+        auto item = static_cast<UpHistoryItem *>(g_ptr_array_index(values, i));
 
         /* Getting the next point after full charge, since upower registers only on state changes,
            typically you get no data while the device is fully charged and plugged and you get a discharging
@@ -155,7 +154,6 @@
     if (deviceString.isNull() || deviceString.isEmpty())
         return QVariantList();
 
-    UpHistoryItem *item;
     GPtrArray *values = NULL;
     gint32 offset = 0;
     GTimeVal timeval;
@@ -174,7 +172,7 @@
     }
 
     for (uint i=values->len-1; i > 0; i--) {
-        item = (UpHistoryItem *) g_ptr_array_index(values, i);
+        auto item = static_cast<UpHistoryItem *>(g_ptr_array_index(values, i));
 
         if (up_history_item_get_state(item) == UP_DEVICE_STATE_UNKNOWN)
             continue;

=== modified file 'plugins/bluetooth/PageComponent.qml'
--- plugins/bluetooth/PageComponent.qml	2014-07-29 15:09:23 +0000
+++ plugins/bluetooth/PageComponent.qml	2014-08-26 21:07:36 +0000
@@ -29,6 +29,8 @@
 
 ItemPage {
     id: root
+    title: i18n.tr("Bluetooth")
+
     UbuntuBluetoothPanel { id: backend }
 
     Component {
@@ -49,19 +51,22 @@
     Connections {
         target: backend.agent
         onPasskeyConfirmationNeeded: {
+            var request_tag = tag
             var popup = PopupUtils.open(confirmPasskeyDialog, root, {passkey: passkey, name: device.name})
-            popup.canceled.connect(function() {target.confirmPasskey(tag, false)})
-            popup.confirmed.connect(function() {target.confirmPasskey(tag, true)})
+            popup.canceled.connect(function() {target.confirmPasskey(request_tag, false)})
+            popup.confirmed.connect(function() {target.confirmPasskey(request_tag, true)})
         }
         onPasskeyNeeded: {
+            var request_tag = tag
             var popup = PopupUtils.open(providePasskeyDialog, root, {name: device.name})
-            popup.canceled.connect(function() {target.providePasskey(tag, false, 0)})
-            popup.provided.connect(function(passkey) {target.providePasskey(tag, true, passkey)})
+            popup.canceled.connect(function() {target.providePasskey(request_tag, false, 0)})
+            popup.provided.connect(function(passkey) {target.providePasskey(request_tag, true, passkey)})
         }
         onPinCodeNeeded: {
+            var request_tag = tag
             var popup = PopupUtils.open(providePinCodeDialog, root, {name: device.name})
-            popup.canceled.connect(function() {target.providePinCode(tag, false, "")})
-            popup.provided.connect(function(pinCode) {target.providePinCode(tag, true, pinCode)})
+            popup.canceled.connect(function() {target.providePinCode(request_tag, false, "")})
+            popup.provided.connect(function(pinCode) {target.providePinCode(request_tag, true, pinCode)})
         }
     }
 
@@ -112,14 +117,20 @@
         }
     }
 
-    Page {
-        id: mainPage
-        title: i18n.tr("Bluetooth")
-        visible: true
+
+    Flickable {
         anchors.fill: parent
+        contentHeight: contentItem.childrenRect.height
+        boundsBehavior: (contentHeight > root.height) ?
+                            Flickable.DragAndOvershootBounds :
+                            Flickable.StopAtBounds
+        /* Set the direction to workaround https://bugreports.qt-project.org/browse/QTBUG-31905
+           otherwise the UI might end up in a situation where scrolling doesn't work */
+        flickableDirection: Flickable.VerticalFlick
 
         Column {
-            anchors.fill: parent
+            anchors.left: parent.left
+            anchors.right: parent.right
 
             QDBusActionGroup {
                 id: bluetoothActionGroup
@@ -205,27 +216,30 @@
                 visible: connectedList.visible
             }
 
-            ListView {
+            Column {
                 id: connectedList
-                width: parent.width
-                height: connectedHeader.height * count
-
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
                 visible: bluetoothActionGroup.enabled && (count > 0)
 
-                model: backend.connectedDevices
-                delegate: ListItem.Standard {
-                    iconSource: iconPath
-                    iconFrame: false
-                    text: getDisplayName(type, displayName)
-                    control: ActivityIndicator {
-                        visible: connection == Device.Connecting
-                        running: true
-                    }
-                    onClicked: {
-                        backend.setSelectedDevice(addressName);
-                        pageStack.push(connectedDevicePage);
-                    }
-                    progression: true
+                Repeater {
+                    model: backend.connectedDevices
+                    delegate: ListItem.Standard {
+                        iconSource: iconPath
+                        iconFrame: false
+                        text: getDisplayName(type, displayName)
+                        control: ActivityIndicator {
+                            visible: connection == Device.Connecting
+                            running: true
+                        }
+                        onClicked: {
+                            backend.setSelectedDevice(addressName);
+                            pageStack.push(connectedDevicePage);
+                        }
+                        progression: true
+                    }
                 }
             }
 
@@ -241,24 +255,27 @@
                 }
             }
 
-            ListView {
+            Column {
                 id: disconnectedList
-                width: parent.width
-                height: disconnectedHeader.height * count
-
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
                 visible: bluetoothActionGroup.enabled && (count > 0)
 
-                model: backend.disconnectedDevices
-                delegate: ListItem.Standard {
-                    iconSource: iconPath
-                    iconFrame: false
-                    text: getDisplayName(type, displayName)
-                    enabled: backend.isSupportedType(type)
-                    onClicked: {
-                        backend.setSelectedDevice(addressName);
-                        pageStack.push(connectedDevicePage);
+                Repeater {
+                    model: backend.disconnectedDevices
+                    delegate: ListItem.Standard {
+                        iconSource: iconPath
+                        iconFrame: false
+                        text: getDisplayName(type, displayName)
+                        enabled: backend.isSupportedType(type)
+                        onClicked: {
+                            backend.setSelectedDevice(addressName);
+                            pageStack.push(connectedDevicePage);
+                        }
+                        progression: true
                     }
-                    progression: true
                 }
             }
             ListItem.Standard {
@@ -275,23 +292,27 @@
                 visible: autoconnectList.visible
                 enabled: bluetoothActionGroup.enabled
             }
-            ListView {
+            Column {
                 id: autoconnectList
-                width: parent.width
-                height: autoconnectHeader.height * count
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
 
                 visible: bluetoothActionGroup.enabled && (count > 0)
 
-                model: backend.autoconnectDevices
-                delegate: ListItem.Standard {
-                    iconSource: iconPath
-                    iconFrame: false
-                    text: getDisplayName(type, displayName)
-                    onClicked: {
-                        backend.setSelectedDevice(addressName);
-                        pageStack.push(connectedDevicePage);
+                Repeater {
+                    model: backend.autoconnectDevices
+                    delegate: ListItem.Standard {
+                        iconSource: iconPath
+                        iconFrame: false
+                        text: getDisplayName(type, displayName)
+                        onClicked: {
+                            backend.setSelectedDevice(addressName);
+                            pageStack.push(connectedDevicePage);
+                        }
+                        progression: true
                     }
-                    progression: true
                 }
             }
         }
@@ -302,100 +323,114 @@
         title: backend.selectedDevice ? backend.selectedDevice.name : i18n.tr("None")
         visible: false
 
-        Column {
+        Flickable {
             anchors.fill: parent
-
-            ListItem.SingleValue {
-                text: i18n.tr("Name")
-                value: backend.selectedDevice ? backend.selectedDevice.name : i18n.tr("None")
-            }
-            ListItem.Standard {
-                Rectangle {
-                    color: "transparent"
-                    anchors.fill: parent
-                    anchors.topMargin: units.gu(1)
-                    anchors.leftMargin: units.gu(2)
-                    anchors.rightMargin: units.gu(2)
-
-                    Label {
-                        anchors {
-                            top: parent.top
-                            left: parent.left
-                            topMargin: units.gu(1)
-                        }
-                        height: units.gu(3)
-                        text: i18n.tr("Type")
-                    }
-                    Image {
-                        anchors {
-                            right: deviceType.left
-                            rightMargin: units.gu(1)
-                        }
-                        height: units.gu(4)
-                        width: units.gu(4)
-                        source: backend.selectedDevice ? backend.selectedDevice.iconName : ""
-                    }
-                    Label {
-                        id: deviceType
-                        anchors {
-                            top: parent.top
-                            right: parent.right
-                            topMargin: units.gu(1)
-                        }
-                        height: units.gu(3)
-                        text: getTypeString(backend.selectedDevice ? backend.selectedDevice.type : Device.OTHER)
-                    }
-                }
-            }
-            ListItem.SingleValue {
-                text: i18n.tr("Status")
-                value: getStatusString(backend.selectedDevice ? backend.selectedDevice.connection : Device.Disconnected)
-            }
-            ListItem.SingleValue {
-                text: i18n.tr("Signal Strength")
-                value: getSignalString(backend.selectedDevice ? backend.selectedDevice.strength : Device.None)
-            }
-            ListItem.Standard {
-                id: trustedCheck
-                text: i18n.tr("Connect automatically when detected:")
-                control: CheckBox {
-                    onClicked: {
-                        if (backend.selectedDevice) {
-                            backend.selectedDevice.trusted = !backend.selectedDevice.trusted
-                        }
-                    }
-                    checked: backend.selectedDevice ? backend.selectedDevice.trusted : false
-                }
-                Component.onCompleted:
-                    clicked.connect(trustedCheck.clicked)
-            }
-            ListItem.SingleControl {
-                control: Button {
-                    text: backend.selectedDevice && (backend.selectedDevice.connection == Device.Connected || backend.selectedDevice.connection == Device.Connecting) ? i18n.tr("Disconnect") : i18n.tr("Connect")
-                    width: parent.width - units.gu(8)
-                    onClicked: {
-                        if (backend.selectedDevice
-                            && (backend.selectedDevice.connection == Device.Connected
-                                || backend.selectedDevice.connection == Device.Connecting)) {
-                            backend.disconnectDevice();
-                        } else {
-                            backend.stopDiscovery()
-                            backend.connectDevice(backend.selectedDevice.address);
-                        }
-                        pageStack.pop();
-                    }
-                    visible: backend.selectedDevice ? true : false
-                }
-            }
-            ListItem.SingleControl {
-                control: Button {
-                    text: i18n.tr("Forget this device")
-                    width: parent.width - units.gu(8)
-                    onClicked: {
-                        backend.removeDevice();
-                        pageStack.pop();
-                    }
-                    enabled: backend.selectedDevice && backend.selectedDevice.path.length > 0 ? true : false
+            contentHeight: contentItem.childrenRect.height
+            boundsBehavior: (contentHeight > root.height) ?
+                                Flickable.DragAndOvershootBounds :
+                                Flickable.StopAtBounds
+            /* Set the direction to workaround https://bugreports.qt-project.org/browse/QTBUG-31905
+               otherwise the UI might end up in a situation where scrolling doesn't work */
+            flickableDirection: Flickable.VerticalFlick
+
+            Column {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+
+                ListItem.SingleValue {
+                    text: i18n.tr("Name")
+                    value: backend.selectedDevice ? backend.selectedDevice.name : i18n.tr("None")
+                }
+                ListItem.Standard {
+                    Rectangle {
+                        color: "transparent"
+                        anchors.fill: parent
+                        anchors.topMargin: units.gu(1)
+                        anchors.leftMargin: units.gu(2)
+                        anchors.rightMargin: units.gu(2)
+
+                        Label {
+                            anchors {
+                                top: parent.top
+                                left: parent.left
+                                topMargin: units.gu(1)
+                            }
+                            height: units.gu(3)
+                            text: i18n.tr("Type")
+                        }
+                        Image {
+                            anchors {
+                                right: deviceType.left
+                                rightMargin: units.gu(1)
+                            }
+                            height: units.gu(4)
+                            width: units.gu(4)
+                            source: backend.selectedDevice ? backend.selectedDevice.iconName : ""
+                        }
+                        Label {
+                            id: deviceType
+                            anchors {
+                                top: parent.top
+                                right: parent.right
+                                topMargin: units.gu(1)
+                            }
+                            height: units.gu(3)
+                            text: getTypeString(backend.selectedDevice ? backend.selectedDevice.type : Device.OTHER)
+                        }
+                    }
+                }
+                ListItem.SingleValue {
+                    text: i18n.tr("Status")
+                    value: getStatusString(backend.selectedDevice ? backend.selectedDevice.connection : Device.Disconnected)
+                }
+                ListItem.SingleValue {
+                    text: i18n.tr("Signal Strength")
+                    value: getSignalString(backend.selectedDevice ? backend.selectedDevice.strength : Device.None)
+                }
+                ListItem.Standard {
+                    id: trustedCheck
+                    text: i18n.tr("Connect automatically when detected:")
+                    control: CheckBox {
+                        onClicked: {
+                            if (backend.selectedDevice) {
+                                backend.selectedDevice.trusted = !backend.selectedDevice.trusted
+                            }
+                        }
+                        checked: backend.selectedDevice ? backend.selectedDevice.trusted : false
+                    }
+                    Component.onCompleted:
+                        clicked.connect(trustedCheck.clicked)
+                }
+                ListItem.SingleControl {
+                    control: Button {
+                        text: backend.selectedDevice && (backend.selectedDevice.connection == Device.Connected || backend.selectedDevice.connection == Device.Connecting) ? i18n.tr("Disconnect") : i18n.tr("Connect")
+                        width: parent.width - units.gu(8)
+                        onClicked: {
+                            if (backend.selectedDevice
+                                && (backend.selectedDevice.connection == Device.Connected
+                                    || backend.selectedDevice.connection == Device.Connecting)) {
+                                backend.disconnectDevice();
+                            } else {
+                                backend.stopDiscovery()
+                                backend.connectDevice(backend.selectedDevice.address);
+                            }
+                            pageStack.pop();
+                        }
+                        visible: backend.selectedDevice ? true : false
+                    }
+                }
+                ListItem.SingleControl {
+                    control: Button {
+                        text: i18n.tr("Forget this device")
+                        width: parent.width - units.gu(8)
+                        onClicked: {
+                            backend.removeDevice();
+                            pageStack.pop();
+                        }
+                        enabled: backend.selectedDevice && backend.selectedDevice.path.length > 0 ? true : false
+                    }
                 }
             }
         }

=== modified file 'plugins/bluetooth/agent.h'
--- plugins/bluetooth/agent.h	2013-09-27 14:55:53 +0000
+++ plugins/bluetooth/agent.h	2014-08-26 21:07:36 +0000
@@ -57,7 +57,7 @@
     void onPairingDone();
 
 private:
-    Q_DISABLE_COPY(Agent);
+    Q_DISABLE_COPY(Agent)
 
     QDBusConnection m_connection;
     DeviceModel &m_devices;

=== modified file 'plugins/bluetooth/bluetooth.cpp'
--- plugins/bluetooth/bluetooth.cpp	2014-07-30 02:25:07 +0000
+++ plugins/bluetooth/bluetooth.cpp	2014-08-26 21:07:36 +0000
@@ -151,10 +151,8 @@
 
 void Bluetooth::disconnectDevice()
 {
-    Device::Type type;
-
     if (m_selectedDevice) {
-        type = m_selectedDevice->getType();
+        auto type = m_selectedDevice->getType();
         if (type == Device::Type::Headset)
             m_selectedDevice->disconnect(Device::ConnectionMode::Audio);
         else if (type == Device::Type::Headphones)

=== modified file 'plugins/bluetooth/bluetooth.h'
--- plugins/bluetooth/bluetooth.h	2014-07-29 16:44:03 +0000
+++ plugins/bluetooth/bluetooth.h	2014-08-26 21:07:36 +0000
@@ -45,22 +45,22 @@
 
     Q_PROPERTY (QObject * selectedDevice
                 READ getSelectedDevice
-                NOTIFY selectedDeviceChanged);
+                NOTIFY selectedDeviceChanged)
 
     Q_PROPERTY (QObject * agent
-                READ getAgent);
+                READ getAgent)
 
     Q_PROPERTY (bool powered
                 READ isPowered
-                NOTIFY poweredChanged);
+                NOTIFY poweredChanged)
 
     Q_PROPERTY (bool discovering
                 READ isDiscovering
-                NOTIFY discoveringChanged);
+                NOTIFY discoveringChanged)
 
     Q_PROPERTY (bool discoverable
                 READ isDiscoverable
-                NOTIFY discoverableChanged);
+                NOTIFY discoverableChanged)
 
 Q_SIGNALS:
     void selectedDeviceChanged();

=== modified file 'plugins/bluetooth/device.cpp'
--- plugins/bluetooth/device.cpp	2014-07-30 14:51:27 +0000
+++ plugins/bluetooth/device.cpp	2014-08-26 21:07:36 +0000
@@ -453,6 +453,7 @@
         default:
             return Type::OtherAudio;
         }
+        break;
 
     case 0x05:
         switch ((c & 0xc0) >> 6) {

=== modified file 'plugins/cellular/CMakeLists.txt'
--- plugins/cellular/CMakeLists.txt	2014-07-17 20:59:15 +0000
+++ plugins/cellular/CMakeLists.txt	2014-08-26 21:07:36 +0000
@@ -9,6 +9,7 @@
     PageComponent.qml
     Hotspot.qml
     HotspotSetup.qml
+    sims.js
 )
 
 

=== modified file 'plugins/cellular/Components/CMakeLists.txt'
--- plugins/cellular/Components/CMakeLists.txt	2014-07-31 20:10:40 +0000
+++ plugins/cellular/Components/CMakeLists.txt	2014-08-26 21:07:36 +0000
@@ -1,6 +1,9 @@
 set(QML_SOURCES
+    NoSim.qml
+    SingleSim.qml
+    MultiSim.qml
     CellularSingleSim.qml
-    CellularDualSim.qml
+    CellularMultiSim.qml
     data-helpers.js
     DefaultSim.qml
     Sim.qml

=== renamed file 'plugins/cellular/Components/CellularDualSim.qml' => 'plugins/cellular/Components/CellularMultiSim.qml'
--- plugins/cellular/Components/CellularDualSim.qml	2014-08-14 13:59:57 +0000
+++ plugins/cellular/Components/CellularMultiSim.qml	2014-08-26 21:07:36 +0000
@@ -24,20 +24,18 @@
 
 Column {
     id: root
-    property var sim1
-    property var sim2
     property var selector: selector
     property var prefMap: ['gsm', 'umts']
 
     function getNameFromIndex (index) {
-        return [i18n.tr("Off"), sim1.title, sim2.title][index];
+        return [i18n.tr("Off"), sims[0].title, sims[1].title][index];
     }
 
     function getUsedSim () {
         if (state === "sim1Online") {
-            return sim1;
+            return sims[0];
         } else if (state === "sim2Online") {
-            return sim2;
+            return sims[1];
         } else {
             return null;
         }
@@ -47,27 +45,27 @@
     states: [
         State {
             name: "sim1Online"
-            when: sim1.connMan.powered && !sim2.connMan.powered
+            when: sims[0].connMan.powered && !sims[1].connMan.powered
             StateChangeScript { script: {
                 selector.selectedIndex =
                     DataHelpers.dualSimKeyToIndex(
-                        sim1.radioSettings.technologyPreference)
+                        sims[0].radioSettings.technologyPreference)
             }}
         },
         State {
             name: "sim2Online"
-            when: sim2.connMan.powered && !sim1.connMan.powered
+            when: sims[1].connMan.powered && !sims[0].connMan.powered
             StateChangeScript { script: {
                 selector.selectedIndex =
                     DataHelpers.dualSimKeyToIndex(
-                        sim2.radioSettings.technologyPreference)
+                        sims[1].radioSettings.technologyPreference)
             }}
         },
         State {
             name: "bothOnline"
-            when: sim1.connMan.powered && sim2.connMan.powered
+            when: sims[0].connMan.powered && sims[1].connMan.powered
             StateChangeScript { script: {
-                sim2.connMan.powered = false;
+                sims[1].connMan.powered = false;
             }}
         }
     ]
@@ -82,16 +80,16 @@
             objectName: "use" + modelData
             text: getNameFromIndex(index)
         }
-        selectedIndex: [true, sim1.connMan.powered, sim2.connMan.powered]
+        selectedIndex: [true, sims[0].connMan.powered, sims[1].connMan.powered]
             .lastIndexOf(true)
         onDelegateClicked: {
-            sim1.connMan.powered = (index === 1)
-            sim2.connMan.powered = (index === 2)
+            sims[0].connMan.powered = (index === 1)
+            sims[1].connMan.powered = (index === 2)
         }
     }
 
     Connections {
-        target: sim1.connMan
+        target: sims[0].connMan
         onPoweredChanged: {
             if (powered) {
                 use.selectedIndex = 1;
@@ -100,7 +98,7 @@
     }
 
     Connections {
-        target: sim2.connMan
+        target: sims[1].connMan
         onPoweredChanged: {
             if (powered) {
                 use.selectedIndex = 2;
@@ -124,9 +122,9 @@
     }
 
     Connections {
-        target: sim1.radioSettings
+        target: sims[0].radioSettings
         onTechnologyPreferenceChanged: {
-            if (sim1.connMan.powered) {
+            if (sims[0].connMan.powered) {
                 selector.selectedIndex =
                     DataHelpers.dualSimKeyToIndex(preference);
             }
@@ -134,9 +132,9 @@
     }
 
     Connections {
-        target: sim2.radioSettings
+        target: sims[1].radioSettings
         onTechnologyPreferenceChanged: {
-            if (sim2.connMan.powered) {
+            if (sims[1].connMan.powered) {
                 selector.selectedIndex =
                     DataHelpers.dualSimKeyToIndex(preference);
             }

=== modified file 'plugins/cellular/Components/CellularSingleSim.qml'
--- plugins/cellular/Components/CellularSingleSim.qml	2014-08-14 13:59:57 +0000
+++ plugins/cellular/Components/CellularSingleSim.qml	2014-08-26 21:07:36 +0000
@@ -25,7 +25,6 @@
 Column {
     height: childrenRect.height
 
-    property var sim1
     property var selector: selector
 
     ListItem.ItemSelector {
@@ -33,15 +32,15 @@
         objectName: "technologyPreferenceSelector"
         text: i18n.tr("Cellular data:")
         expanded: true
-        enabled: sim1.radioSettings.technologyPreference !== ""
+        enabled: sim.radioSettings.technologyPreference !== ""
         model: [
             i18n.tr("Off"),
             i18n.tr("2G only (saves battery)"),
             i18n.tr("2G/3G/4G (faster)")]
         selectedIndex: {
-            if (sim1.connMan.powered) {
+            if (sim.connMan.powered) {
                 return DataHelpers.singleSimKeyToIndex(
-                    sim1.radioSettings.technologyPreference);
+                    sim.radioSettings.technologyPreference);
             } else {
                 return 0;
             }
@@ -52,20 +51,20 @@
         id: dataRoamingItem
         objectName: "dataRoamingSwitch"
         text: i18n.tr("Data roaming")
-        enabled: sim1.connMan.powered
+        enabled: sim.connMan.powered
         control: Switch {
             id: dataRoamingControl
-            checked: sim1.connMan.roamingAllowed
-            onClicked: sim1.connMan.roamingAllowed = checked
+            checked: sim.connMan.roamingAllowed
+            onClicked: sim.connMan.roamingAllowed = checked
         }
     }
 
     Connections {
-        target: sim1.connMan
+        target: sim.connMan
         onPoweredChanged: {
             if (powered) {
                 selector.selectedIndex = DataHelpers.singleSimKeyToIndex(
-                    sim1.radioSettings.technologyPreference);
+                    sim.radioSettings.technologyPreference);
             } else {
                 selector.selectedIndex = 0;
             }
@@ -73,24 +72,24 @@
     }
 
     Connections {
-        target: sim1.radioSettings
+        target: sim.radioSettings
         onTechnologyPreferenceChanged: {
             var selIndex = selector.selectedIndex;
             if (selIndex > 0) {
-                sim1.radioSettings.technologyPreference =
+                sim.radioSettings.technologyPreference =
                     DataHelpers.singleSimIndexToKey(selIndex);
             }
         }
     }
 
     Binding {
-        target: sim1.connMan
+        target: sim.connMan
         property: "powered"
         value: selector.selectedIndex !== 0
     }
 
     Binding {
-        target: sim1.radioSettings
+        target: sim.radioSettings
         property: "technologyPreference"
         value: {
             var i = selector.selectedIndex;
@@ -99,7 +98,7 @@
             } else if (i === 2) {
                 return 'umts';
             } else {
-                return sim1.radioSettings.technologyPreference
+                return sim.radioSettings.technologyPreference
             }
         }
     }

=== modified file 'plugins/cellular/Components/DefaultSim.qml'
--- plugins/cellular/Components/DefaultSim.qml	2014-08-14 09:59:56 +0000
+++ plugins/cellular/Components/DefaultSim.qml	2014-08-26 21:07:36 +0000
@@ -23,10 +23,10 @@
 
 Column {
 
-    property var m: ["ask", sim1.path, sim2.path]
+    property var m: ["ask", sims[0].path, sims[1].path]
 
     function getNameFromIndex (index) {
-        return [i18n.tr("Ask me each time"), sim1.title, sim2.title][index];
+        return [i18n.tr("Ask me each time"), sims[0].title, sims[1].title][index];
     }
 
     ListItem.ItemSelector {
@@ -45,8 +45,7 @@
     }
 
     ListItem.Caption {
-        text: i18n.tr("You can change the SIM for individual calls,
-            or for contacts in the address book.")
+        text: i18n.tr("You can change the SIM for individual calls, or for contacts in the address book.")
     }
 
     ListItem.Divider {}

=== added file 'plugins/cellular/Components/MultiSim.qml'
--- plugins/cellular/Components/MultiSim.qml	1970-01-01 00:00:00 +0000
+++ plugins/cellular/Components/MultiSim.qml	2014-08-26 21:07:36 +0000
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Jonas G. Drange <[e-mail]>
+ *
+*/
+import QtQuick 2.0
+import GSettings 1.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Column {
+
+    objectName: "multiSim"
+
+    property var sims
+    property var modems
+
+    // make settings available to all children of root
+    property var settings: phoneSettings
+
+    CellularMultiSim {
+        anchors { left: parent.left; right: parent.right }
+    }
+
+    ListItem.Divider {}
+
+    ListItem.SingleValue {
+        text : i18n.tr("Hotspot disabled because Wi-Fi is off.")
+        visible: showAllUI && !hotspotItem.visible
+    }
+
+    ListItem.SingleValue {
+        id: hotspotItem
+        text: i18n.tr("Wi-Fi hotspot")
+        progression: true
+        onClicked: {
+            pageStack.push(Qt.resolvedUrl("Hotspot.qml"))
+        }
+        visible: showAllUI && (actionGroup.actionObject.valid ? actionGroup.actionObject.state : false)
+    }
+
+    ListItem.Standard {
+        id: dataUsage
+        text: i18n.tr("Data usage statistics")
+        progression: true
+        visible: showAllUI
+    }
+
+    ListItem.Divider {
+        visible: hotspotItem.visible || dataUsage.visible
+    }
+
+    ListItem.SingleValue {
+        text: i18n.tr("Carriers")
+        id: chooseCarrier
+        objectName: "chooseCarrier"
+        progression: enabled
+        onClicked: {
+            pageStack.push(Qt.resolvedUrl("../PageChooseCarriers.qml"), {
+                sims: sims
+            });
+        }
+    }
+
+    ListItem.Divider {}
+
+    SimEditor {
+        anchors { left: parent.left; right: parent.right }
+    }
+
+    ListItem.Divider {}
+
+    DefaultSim {
+        anchors { left: parent.left; right: parent.right }
+    }
+
+    GSettings {
+        id: phoneSettings
+        schema.id: "com.ubuntu.phone"
+        Component.onCompleted: {
+            // set default names
+            var simNames = phoneSettings.simNames;
+            var m0 = modems[0];
+            var m1 = modems[1];
+            if (!simNames[m0]) {
+                simNames[m0] = "SIM 1";
+            }
+            if (!simNames[m1]) {
+                simNames[m1] = "SIM 2";
+            }
+            phoneSettings.simNames = simNames;
+        }
+    }
+
+    Binding {
+        target: sims[0]
+        property: "name"
+        value: phoneSettings.simNames[modems[0]]
+    }
+
+    Binding {
+        target: sims[1]
+        property: "name"
+        value: phoneSettings.simNames[modems[1]]
+    }
+}

=== added file 'plugins/cellular/Components/NoSim.qml'
--- plugins/cellular/Components/NoSim.qml	1970-01-01 00:00:00 +0000
+++ plugins/cellular/Components/NoSim.qml	2014-08-26 21:07:36 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Jonas G. Drange <[e-mail]>
+ *
+*/
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Column {
+
+    objectName: "noSim"
+
+    ListItem.ItemSelector {
+        text: i18n.tr("Cellular data:")
+        expanded: true
+        enabled: false
+        model: [i18n.tr("Off"), i18n.tr("2G only (saves battery)"), i18n.tr("2G/3G/4G (faster)")]
+        selectedIndex: -1
+    }
+
+    ListItem.Standard {
+        text: i18n.tr("Data roaming")
+        enabled: false
+        control: Switch {
+            checked: false
+        }
+    }
+
+    ListItem.Divider {}
+
+    ListItem.SingleValue {
+        text: i18n.tr("Carrier");
+        value: i18n.tr("N/A")
+        enabled: false
+    }
+}

=== modified file 'plugins/cellular/Components/Sim.qml'
--- plugins/cellular/Components/Sim.qml	2014-07-25 13:33:36 +0000
+++ plugins/cellular/Components/Sim.qml	2014-08-26 21:07:36 +0000
@@ -21,12 +21,14 @@
 import MeeGo.QOfono 0.2
 
 Item {
+    id: root
     property alias modem: modem
     property alias netReg: netReg
     property alias radioSettings: radioSettings
     property alias simMng: simMng
     property alias connMan: connMan
 
+    property alias present: simMng.present
     property string path
     property string name
     property string title: {

=== modified file 'plugins/cellular/Components/SimEditor.qml'
--- plugins/cellular/Components/SimEditor.qml	2014-08-15 19:58:34 +0000
+++ plugins/cellular/Components/SimEditor.qml	2014-08-26 21:07:36 +0000
@@ -44,7 +44,7 @@
             name: "editingSim1"
             PropertyChanges {
                 target: nameField
-                text: sim1.name
+                text: sims[0].name
             }
             ParentChange {
                 target: editor
@@ -60,7 +60,7 @@
             name: "editingSim2"
             PropertyChanges {
                 target: nameField
-                text: sim2.name
+                text: sims[1].name
             }
             ParentChange {
                 target: editor
@@ -108,7 +108,7 @@
                             right: parent.right
                             verticalCenter: parent.verticalCenter
                         }
-                        text: sim1.title
+                        text: sims[0].title
                     }
                 }
                 Column {
@@ -144,7 +144,7 @@
                             right: parent.right
                             verticalCenter: parent.verticalCenter
                         }
-                        text: sim2.title
+                        text: sims[1].title
                     }
                 }
                 Column {
@@ -213,11 +213,11 @@
             onTriggered: {
                 var tmpSimNames = {};
                 if (simList.state === "editingSim1") {
-                    tmpSimNames[sim1.path] = nameField.text;
-                    tmpSimNames[sim2.path] = sim2.name;
+                    tmpSimNames[sims[0].path] = nameField.text;
+                    tmpSimNames[sims[1].path] = sims[1].name;
                 } else if (simList.state === "editingSim2") {
-                    tmpSimNames[sim1.path] = sim1.name;
-                    tmpSimNames[sim2.path] = nameField.text;
+                    tmpSimNames[sims[0].path] = sims[0].name;
+                    tmpSimNames[sims[1].path] = nameField.text;
                 }
                 phoneSettings.simNames = tmpSimNames;
                 simList.state = "";

=== added file 'plugins/cellular/Components/SingleSim.qml'
--- plugins/cellular/Components/SingleSim.qml	1970-01-01 00:00:00 +0000
+++ plugins/cellular/Components/SingleSim.qml	2014-08-26 21:07:36 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Jonas G. Drange <[e-mail]>
+ *
+*/
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Column {
+
+    objectName: "singleSim"
+
+    property var sim
+
+    CellularSingleSim {
+        anchors { left: parent.left; right: parent.right }
+    }
+
+    ListItem.Divider {}
+
+    ListItem.SingleValue {
+        text : i18n.tr("Hotspot disabled because Wi-Fi is off.")
+        visible: showAllUI && !hotspotItem.visible
+    }
+
+    ListItem.SingleValue {
+        id: hotspotItem
+        text: i18n.tr("Wi-Fi hotspot")
+        progression: true
+        onClicked: {
+            pageStack.push(Qt.resolvedUrl("Hotspot.qml"))
+        }
+        visible: showAllUI && (actionGroup.actionObject.valid ? actionGroup.actionObject.state : false)
+    }
+
+    ListItem.Standard {
+        text: i18n.tr("Data usage statistics")
+        progression: true
+        visible: showAllUI
+    }
+
+    ListItem.SingleValue {
+        text: i18n.tr("Carrier");
+        id: chooseCarrier
+        objectName: "chooseCarrier"
+        progression: enabled
+        value: sim.netReg.name || i18n.tr("N/A")
+        onClicked: {
+            pageStack.push(Qt.resolvedUrl("../PageChooseCarrier.qml"), {
+                netReg: sim.netReg,
+                title: i18n.tr("Carrier")
+            })
+        }
+    }
+
+    ListItem.Standard {
+        text: i18n.tr("APN")
+        progression: true
+        visible: showAllUI
+    }
+}

=== modified file 'plugins/cellular/PageChooseCarriers.qml'
--- plugins/cellular/PageChooseCarriers.qml	2014-07-24 19:00:45 +0000
+++ plugins/cellular/PageChooseCarriers.qml	2014-08-26 21:07:36 +0000
@@ -28,8 +28,7 @@
     title: i18n.tr("Carriers")
     objectName: "chooseCarriersPage"
 
-    property var sim1
-    property var sim2
+    property var sims
 
     Flickable {
         anchors.fill: parent
@@ -42,33 +41,33 @@
             anchors.right: parent.right
 
             ListItem.Standard {
-                text: sim1.title
+                text: sims[0].title
             }
 
             ListItem.SingleValue {
                 objectName: "chooseCarrierSim1"
-                value: sim1.netReg.name ? sim1.netReg.name : i18n.tr("N/A")
+                value: sims[0].netReg.name ? sims[0].netReg.name : i18n.tr("N/A")
                 progression: true
                 onClicked: {
                     pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), {
-                        netReg: sim1.netReg,
-                        title: sim1.title
+                        netReg: sims[0].netReg,
+                        title: sims[0].title
                     })
                 }
             }
 
             ListItem.Standard {
-                text: sim2.title
+                text: sims[1].title
             }
 
             ListItem.SingleValue {
                 objectName: "chooseCarrierSim2"
-                value: sim2.netReg.name ? sim2.netReg.name : i18n.tr("N/A")
+                value: sims[1].netReg.name ? sims[1].netReg.name : i18n.tr("N/A")
                 progression: true
                 onClicked: {
                     pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), {
-                        netReg: sim2.netReg,
-                        title: sim2.title
+                        netReg: sims[1].netReg,
+                        title: sims[1].title
                     })
                 }
             }

=== modified file 'plugins/cellular/PageComponent.qml'
--- plugins/cellular/PageComponent.qml	2014-08-12 16:25:26 +0000
+++ plugins/cellular/PageComponent.qml	2014-08-26 21:07:36 +0000
@@ -19,53 +19,69 @@
  */
 
 import QtQuick 2.0
-import GSettings 1.0
 import SystemSettings 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import MeeGo.QOfono 0.2
 import QMenuModel 0.1
-import "Components"
+import "Components" as LocalComponents
+import "sims.js" as Sims
 
 ItemPage {
     id: root
     title: i18n.tr("Cellular")
     objectName: "cellularPage"
 
-    // pointers to sim 1 and 2, lazy loaded
-    property alias sim1: simOneLoader.item
-    property alias sim2: simTwoLoader.item
     property var modemsSorted: manager.modems.slice(0).sort()
+    property int simsLoaded: 0
 
     states: [
         State {
+            name: "noSim"
+            when: (simsLoaded === 0) || (Sims.getPresentCount() === 0)
+            StateChangeScript {
+                script: loader.source = "Components/NoSim.qml"
+            }
+        },
+        State {
             name: "singleSim"
             StateChangeScript {
-                name: "loadSim"
-                script: {
-                    var p = modemsSorted[0];
-                    simOneLoader.setSource("Components/Sim.qml", {
-                        path: p
-                    });
-                }
+                script: loader.setSource("Components/SingleSim.qml", {
+                    sim: Sims.get(0)
+                })
             }
+            when: simsLoaded && (Sims.getPresentCount() === 1)
         },
         State {
-            name: "dualSim"
-            extend: "singleSim"
+            name: "multiSim"
             StateChangeScript {
-                name: "loadSecondSim"
-                script: {
-                    var p = modemsSorted[1];
-                    simTwoLoader.setSource("Components/Sim.qml", {
-                        path: p
-                    });
-                    defaultSimLoader.source = "Components/DefaultSim.qml";
-                }
+                script: loader.setSource("Components/MultiSim.qml", {
+                    sims: Sims.getAll(),
+                    modems: modemsSorted
+                })
             }
+            when: simsLoaded && (Sims.getPresentCount() > 1)
         }
     ]
 
+    OfonoManager {
+        id: manager
+        Component.onCompleted: {
+            var component = Qt.createComponent("Components/Sim.qml");
+            modemsSorted.forEach(function (path) {
+                console.warn('creating sim object for', path)
+                var sim = component.createObject(root, {
+                    path: path
+                });
+                if (sim === null) {
+                    console.warn('failed to create sim object');
+                } else {
+                    Sims.add(sim);
+                }
+            });
+        }
+    }
+
     QDBusActionGroup {
         id: actionGroup
         busType: 1
@@ -78,42 +94,6 @@
             start()
         }
     }
-
-    OfonoManager {
-        id: manager
-        Component.onCompleted: {
-            if (modems.length === 1) {
-                root.state = "singleSim";
-            } else if (modems.length === 2) {
-                root.state = "dualSim";
-            }
-        }
-    }
-
-    Loader {
-        id: simOneLoader
-        onLoaded: {
-            if (parent.state === "singleSim") {
-                cellData.setSource("Components/CellularSingleSim.qml", {
-                    sim1: sim1
-                });
-            }
-        }
-    }
-
-    Loader {
-        id: simTwoLoader
-        onLoaded: {
-            // unload any single sim setup
-            cellData.source = "";
-            cellData.setSource("Components/CellularDualSim.qml", {
-                sim1: sim1,
-                sim2: sim2
-            });
-            simEditorLoader.source = "Components/SimEditor.qml";
-        }
-    }
-
     Flickable {
         anchors.fill: parent
         contentWidth: parent.width
@@ -124,106 +104,9 @@
             anchors { left: parent.left; right: parent.right }
 
             Loader {
-                id: cellData
-                anchors { left: parent.left; right: parent.right }
-            }
-
-            ListItem.SingleValue {
-                text : i18n.tr("Hotspot disabled because Wi-Fi is off.")
-                visible: showAllUI && !hotspotItem.visible
-            }
-
-            ListItem.SingleValue {
-                id: hotspotItem
-                text: i18n.tr("Wi-Fi hotspot")
-                progression: true
-                onClicked: {
-                    pageStack.push(Qt.resolvedUrl("Hotspot.qml"))
-                }
-                visible: showAllUI && (actionGroup.actionObject.valid ? actionGroup.actionObject.state : false)
-            }
-
-            ListItem.Standard {
-                text: i18n.tr("Data usage statistics")
-                progression: true
-                visible: showAllUI
-            }
-
-            ListItem.SingleValue {
-                text: i18n.tr("Carrier", "Carriers", manager.modems.length);
-                id: chooseCarrier
-                objectName: "chooseCarrier"
-                progression: enabled
-                onClicked: {
-                    if (root.state === 'singleSim') {
-                        pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), {
-                            netReg: sim1.netReg,
-                            title: i18n.tr("Carrier")
-                        })
-                    } else if (root.state === 'dualSim') {
-                        pageStack.push(Qt.resolvedUrl("PageChooseCarriers.qml"), {
-                            sim1: sim1,
-                            sim2: sim2
-                        });
-                    }
-                }
-            }
-
-            Binding {
-                target: chooseCarrier
-                property: "value"
-                value: sim1.netReg.name || i18n.tr("N/A")
-                when: (simOneLoader.status === Loader.Ready) && root.state === "singleSim"
-            }
-
-            ListItem.Standard {
-                text: i18n.tr("APN")
-                progression: true
-                visible: showAllUI
-            }
-
-            Loader {
-                id: simEditorLoader
-                anchors { left: parent.left; right: parent.right }
-            }
-
-            ListItem.Divider {}
-
-            Loader {
-                id: defaultSimLoader
-                anchors.left: parent.left
-                anchors.right: parent.right
-            }
-        }
-    }
-
-    GSettings {
-        id: phoneSettings
-        schema.id: "com.ubuntu.phone"
-        Component.onCompleted: {
-            // set default names
-            var simNames = phoneSettings.simNames;
-            var m0 = modemsSorted[0];
-            var m1 = modemsSorted[1];
-            if (!simNames[m0]) {
-                simNames[m0] = "SIM 1";
-            }
-            if (!simNames[m1]) {
-                simNames[m1] = "SIM 2";
-            }
-            phoneSettings.simNames = simNames;
-        }
-    }
-
-    Binding {
-        target: sim1
-        property: "name"
-        value: phoneSettings.simNames[modemsSorted[0]]
-    }
-
-    Binding {
-        target: sim2
-        property: "name"
-        value: phoneSettings.simNames[modemsSorted[1]]
+                id: loader
+                anchors { left: parent.left; right: parent.right }
+            }
+        }
     }
 }

=== added file 'plugins/cellular/sims.js'
--- plugins/cellular/sims.js	1970-01-01 00:00:00 +0000
+++ plugins/cellular/sims.js	2014-08-26 21:07:36 +0000
@@ -0,0 +1,34 @@
+var sims = [];
+
+function add (sim) {
+    sims.push(sim);
+    root.simsLoaded++;
+}
+
+function getAll () {
+    return sims;
+}
+
+function get (n) {
+    return getAll()[n];
+}
+
+function getCount () {
+    return getAll().length;
+}
+
+function getPresent () {
+    var present = [];
+    getAll().forEach(function (sim) {
+        if (sim.present) {
+            present.push(sim);
+        } else {
+            return;
+        }
+    });
+    return present;
+}
+
+function getPresentCount () {
+    return getPresent().length;
+}

=== modified file 'plugins/notifications/notification_item.cpp'
--- plugins/notifications/notification_item.cpp	2014-07-18 15:22:59 +0000
+++ plugins/notifications/notification_item.cpp	2014-08-26 21:07:36 +0000
@@ -20,7 +20,8 @@
 namespace NotificationsPlugin {
 
 NotificationItem::NotificationItem(QObject *parent) :
-    QObject(parent)
+    QObject(parent),
+    m_status(false)
 {
 }
 

=== modified file 'plugins/phone/CMakeLists.txt'
--- plugins/phone/CMakeLists.txt	2014-07-09 13:17:47 +0000
+++ plugins/phone/CMakeLists.txt	2014-08-26 21:07:36 +0000
@@ -1,10 +1,15 @@
 set(QML_SOURCES
     CallForwarding.qml
     CallWaiting.qml
+    MultiSim.qml
+    NoSims.qml
+    Ofono.qml
     PageComponent.qml
     ServiceInfo.qml
     Services.qml
+    SingleSim.qml
     dateUtils.js
+    sims.js
 )
 
 # We need a dummy target so the QML files show up in Qt Creator

=== modified file 'plugins/phone/CallForwarding.qml'
--- plugins/phone/CallForwarding.qml	2014-07-22 20:10:26 +0000
+++ plugins/phone/CallForwarding.qml	2014-08-26 21:07:36 +0000
@@ -22,22 +22,22 @@
 import SystemSettings 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
-import MeeGo.QOfono 0.2
 
 ItemPage {
-    title: i18n.tr("Call forwarding")
 
-    property bool forwarding: callForwarding.voiceUnconditional !== ""
-    property string modem
+    objectName: "callForwardingPage"
+    title: headerTitle
+    property var sim
+    property bool forwarding: sim.callForwarding.voiceUnconditional !== ""
+    property string headerTitle: i18n.tr("Call forwarding")
 
     onForwardingChanged: {
         if (callForwardingSwitch.checked !== forwarding)
             callForwardingSwitch.checked = forwarding;
     }
 
-    OfonoCallForwarding {
-        id: callForwarding
-        modemPath: modem
+    Connections {
+        target: sim.callForwarding
         onVoiceUnconditionalChanged: {
             destNumberField.text = voiceUnconditional;
         }
@@ -50,13 +50,14 @@
 
     Switch {
         id: callForwardingSwitch
+        objectName: "callForwardingSwitch"
         checked: forwarding
         enabled: (forwarding === checked)
         visible: callForwardingItem.control === callForwardingSwitch
         onCheckedChanged: {
             if (!checked && forwarding) {
                 callForwardingIndicator.running = true;
-                callForwarding.voiceUnconditional = "";
+                sim.callForwarding.voiceUnconditional = "";
             }
         }
     }
@@ -101,17 +102,18 @@
             visible: callForwardingSwitch.checked
             control: TextInput {
                 id: destNumberField
+                objectName: "destNumberField"
                 horizontalAlignment: TextInput.AlignRight
                 width: forwardToItem.width/2
                 inputMethodHints: Qt.ImhDialableCharactersOnly
-                text: callForwarding.voiceUnconditional
+                text: sim.callForwarding.voiceUnconditional
                 font.pixelSize: units.dp(18)
                 font.weight: Font.Light
                 font.family: "Ubuntu"
                 color: "#AAAAAA"
                 maximumLength: 20
                 focus: true
-                cursorVisible: text !== callForwarding.voiceUnconditional ||
+                cursorVisible: text !== sim.callForwarding.voiceUnconditional ||
                                text === ""
                 clip: true
                 opacity: 0.9
@@ -133,30 +135,32 @@
                 spacing: units.gu(2)
 
                 Button {
+                    objectName: "cancel"
                     text: i18n.tr("Cancel")
                     width: (buttonsRowId.width-units.gu(2)*4)/3
                     enabled: !callForwardingIndicator.running
                     onClicked: {
                         destNumberField.text =
-                                callForwarding.voiceUnconditional;
+                                sim.callForwarding.voiceUnconditional;
                         if (forwarding !== callForwardingSwitch.checked)
                             callForwardingSwitch.checked = forwarding;
                     }
                 }
 
                 Button {
+                    objectName: "set"
                     text: i18n.tr("Set")
                     width: (buttonsRowId.width-units.gu(2)*4)/3
                     enabled: !callForwardingIndicator.running
                     onClicked: {
                         callForwardingIndicator.running = true;
-                        callForwarding.voiceUnconditional = destNumberField.text;
+                        sim.callForwarding.voiceUnconditional = destNumberField.text;
                     }
                 }
             }
             visible: callForwardingSwitch.checked &&
                      (destNumberField.text !==
-                      callForwarding.voiceUnconditional)
+                      sim.callForwarding.voiceUnconditional)
         }
     }
 }

=== modified file 'plugins/phone/CallWaiting.qml'
--- plugins/phone/CallWaiting.qml	2014-07-16 16:45:25 +0000
+++ plugins/phone/CallWaiting.qml	2014-08-26 21:07:36 +0000
@@ -25,15 +25,24 @@
 import MeeGo.QOfono 0.2
 
 ItemPage {
-    title: i18n.tr("Call waiting")
-    property string modem
+    objectName: "callWaitingPage"
+    title: headerTitle
+    property var sim
+    property string headerTitle: i18n.tr("Call waiting")
 
     OfonoCallSettings {
         id: callSettings
-        modemPath: modem
+        modemPath: sim.path
         onVoiceCallWaitingChanged: {
             callWaitingIndicator.running = false;
         }
+        onGetPropertiesFailed: {
+            console.warn('callSettings, onGetPropertiesFailed');
+            callWaitingIndicator.running = false;
+        }
+        onVoiceCallWaitingComplete: {
+            callWaitingIndicator.running = false;
+        }
     }
 
     ActivityIndicator {
@@ -44,7 +53,9 @@
 
     Switch {
         id: callWaitingSwitch
+        objectName: "callWaitingSwitch"
         visible: !callWaitingIndicator.running
+        enabled: callSettings.ready
         checked: callSettings.voiceCallWaiting !== "disabled"
         onClicked: {
             callWaitingIndicator.running = true;

=== added file 'plugins/phone/MultiSim.qml'
--- plugins/phone/MultiSim.qml	1970-01-01 00:00:00 +0000
+++ plugins/phone/MultiSim.qml	2014-08-26 21:07:36 +0000
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Ken Vandine <[e-mail]>
+ * Jonas G. Drange <[e-mail]>
+ *
+*/
+import QtQuick 2.0
+import GSettings 1.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Column {
+
+    property var sims
+
+    ListItem.Standard {
+        text: sims[0].title
+    }
+
+    ListItem.Standard {
+        objectName: "callFwdSim1"
+        text: i18n.tr("Call forwarding")
+        progression: true
+        onClicked: pageStack.push(Qt.resolvedUrl("CallForwarding.qml"), {
+            sim: sims[0],
+            headerTitle: sims[0].title
+        })
+    }
+
+    ListItem.Standard {
+        objectName: "callWaitSim1"
+        text: i18n.tr("Call waiting")
+        progression: true
+        onClicked: pageStack.push(Qt.resolvedUrl("CallWaiting.qml"), {
+            sim: sims[0],
+            headerTitle: sims[0].title
+        })
+    }
+
+    ListItem.Standard {
+        objectName: "simServicesSim1"
+        text: i18n.tr("Services")
+        progression: true
+        enabled: sims[0].simMng.present
+        onClicked: pageStack.push(Qt.resolvedUrl("Services.qml"), {
+            carrierString: sims[0].netReg.name,
+            sim: sims[0].simMng,
+            headerTitle: sims[0].title
+        })
+    }
+
+    ListItem.Divider {}
+
+    ListItem.Standard {
+        text: sims[1].title
+    }
+
+    ListItem.Standard {
+        objectName: "callFwdSim2"
+        text: i18n.tr("Call forwarding")
+        progression: true
+        onClicked: pageStack.push(Qt.resolvedUrl("CallForwarding.qml"), {
+            sim: sims[1],
+            headerTitle: sims[1].title
+        })
+    }
+
+    ListItem.Standard {
+        objectName: "callWaitSim2"
+        text: i18n.tr("Call waiting")
+        progression: true
+        onClicked: pageStack.push(Qt.resolvedUrl("CallWaiting.qml"), {
+            sim: sims[1],
+            headerTitle: sims[1].title
+        })
+    }
+
+    ListItem.Standard {
+        objectName: "simServicesSim2"
+        text: i18n.tr("Services")
+        progression: true
+        enabled: sims[1].simMng.present
+        onClicked: pageStack.push(Qt.resolvedUrl("Services.qml"), {
+            carrierString: sims[1].netReg.name,
+            sim: sims[1].simMng,
+            headerTitle: sims[1].title
+        })
+    }
+
+
+    GSettings {
+        id: phoneSettings
+        schema.id: "com.ubuntu.phone"
+        Component.onCompleted: {
+            // set default names
+            var simNames = phoneSettings.simNames;
+            var m0 = sims[0].path
+            var m1 = sims[1].path
+            if (!simNames[m0]) {
+                simNames[m0] = "SIM 1";
+            }
+            if (!simNames[m1]) {
+                simNames[m1] = "SIM 2";
+            }
+            phoneSettings.simNames = simNames;
+        }
+    }
+
+    Binding {
+        target: sims[0]
+        property: "name"
+        value: phoneSettings.simNames[modemsSorted[0]]
+    }
+
+    Binding {
+        target: sims[1]
+        property: "name"
+        value: phoneSettings.simNames[modemsSorted[1]]
+    }
+
+}

=== added file 'plugins/phone/NoSims.qml'
--- plugins/phone/NoSims.qml	1970-01-01 00:00:00 +0000
+++ plugins/phone/NoSims.qml	2014-08-26 21:07:36 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Ken Vandine <[e-mail]>
+ * Jonas G. Drange <[e-mail]>
+ *
+*/
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Column {
+
+    ListItem.Standard {
+        text: i18n.tr("Call forwarding")
+        progression: true
+        enabled: false
+    }
+
+    ListItem.Standard {
+        text: i18n.tr("Call waiting")
+        progression: true
+        enabled: false
+    }
+
+    ListItem.Divider {}
+
+    ListItem.Standard {
+        text: i18n.tr("Services")
+        progression: true
+        enabled: false
+    }
+}

=== added file 'plugins/phone/Ofono.qml'
--- plugins/phone/Ofono.qml	1970-01-01 00:00:00 +0000
+++ plugins/phone/Ofono.qml	2014-08-26 21:07:36 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Jonas G. Drange <[e-mail]>
+ *
+*/
+import QtQuick 2.0
+import MeeGo.QOfono 0.2
+
+Item {
+    property alias callForwarding: callForwarding
+    property alias netReg: netReg
+    property alias simMng: simMng
+    property alias present: simMng.present
+
+    property string path
+    property string name
+    property string title: {
+        var number = simMng.subscriberNumbers[0] || simMng.subscriberIdentity;
+        return name + (number ? " (" + number + ")" : "");
+    }
+
+    OfonoCallForwarding {
+        id: callForwarding
+        modemPath: path
+    }
+
+    OfonoNetworkRegistration {
+        id: netReg
+        modemPath: path
+    }
+
+    OfonoSimManager {
+        id: simMng
+        modemPath: path
+    }
+}

=== modified file 'plugins/phone/PageComponent.qml'
--- plugins/phone/PageComponent.qml	2014-07-18 13:00:36 +0000
+++ plugins/phone/PageComponent.qml	2014-08-26 21:07:36 +0000
@@ -23,52 +23,77 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import MeeGo.QOfono 0.2
+import "sims.js" as Sims
 
 ItemPage {
+    id: root
+    objectName: "phonePage"
     title: i18n.tr("Phone")
-    property string carrierName: netop.name
-    property string carrierString: carrierName ? carrierName : i18n.tr("SIM")
+    flickable: flick
+
+    property var modemsSorted: manager.modems.slice(0).sort()
+    property var simsLoaded: 0
+
+    states: [
+        State {
+            name: "noSim"
+            StateChangeScript {
+                script: loader.setSource("NoSims.qml")
+            }
+            when: (simsLoaded === 0) || (Sims.getPresentCount() === 0)
+        },
+        State {
+            name: "singleSim"
+            StateChangeScript {
+                script: loader.setSource("SingleSim.qml", { sim: Sims.get(0) })
+
+            }
+            when: simsLoaded && (Sims.getPresentCount() === 1)
+        },
+        State {
+            name: "multiSim"
+            StateChangeScript {
+                script: loader.setSource("MultiSim.qml", {
+                    sims: Sims.getAll()
+                })
+            }
+            when: simsLoaded && (Sims.getPresentCount() > 1)
+        }
+    ]
 
     OfonoManager {
         id: manager
-    }
-
-    OfonoNetworkRegistration {
-        id: netop;
-        modemPath: manager.modems[0]
-        onNameChanged: carrierName = netop.name
-    }
-
-    OfonoSimManager {
-        id: sim
-        modemPath: manager.modems[0]
-    }
-
-    Column {
+        Component.onCompleted: {
+            // create ofono bindings for all modem paths
+            var component = Qt.createComponent("Ofono.qml");
+            modemsSorted.forEach(function (path) {
+                var sim = component.createObject(root, {
+                    path: path
+                });
+                if (sim === null) {
+                    console.warn('failed to create sim object');
+                } else {
+                    Sims.add(sim);
+                }
+            });
+        }
+    }
+
+    Flickable {
+        id: flick
         anchors.fill: parent
-
-        ListItem.Standard {
-            text: i18n.tr("Call forwarding")
-            progression: true
-            onClicked: pageStack.push(Qt.resolvedUrl("CallForwarding.qml"), {modem: manager.modems[0]})
-        }
-
-        ListItem.Standard {
-            text: i18n.tr("Call waiting")            
-            progression: true
-            onClicked: pageStack.push(Qt.resolvedUrl("CallWaiting.qml"), {modem: manager.modems[0]})
-            showDivider: false
-        }
-
-        ListItem.Divider {}
-
-        ListItem.Standard {
-            // TRANSLATORS: %1 is the name of the (network) carrier
-            text: i18n.tr("%1 Services").arg(carrierString)
-            progression: true
-            enabled: sim.present
-            onClicked: pageStack.push(Qt.resolvedUrl("Services.qml"),
-                                      {carrierString: carrierString, sim: sim})
+        contentWidth: parent.width
+        contentHeight: contentItem.childrenRect.height
+        boundsBehavior: (contentHeight > root.height) ?
+            Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
+
+        Column {
+            anchors { left: parent.left; right: parent.right }
+
+            Loader {
+                id: loader
+                anchors { left: parent.left; right: parent.right }
+            }
         }
     }
 }

=== modified file 'plugins/phone/Services.qml'
--- plugins/phone/Services.qml	2014-06-19 03:54:01 +0000
+++ plugins/phone/Services.qml	2014-08-26 21:07:36 +0000
@@ -24,12 +24,15 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 ItemPage {
+    objectName: "servicesPage"
+    title: headerTitle
     property string carrierString
     property variant sim
     property var names: []
 
     // TRANSLATORS: %1 is the name of the (network) carrier
-    title: i18n.tr("%1 Services").arg(carrierString)
+    property string headerTitle: i18n.tr("%1 Services").arg(carrierString)
+
 
     Component.onCompleted: {
         var keys = [];

=== added file 'plugins/phone/SingleSim.qml'
--- plugins/phone/SingleSim.qml	1970-01-01 00:00:00 +0000
+++ plugins/phone/SingleSim.qml	2014-08-26 21:07:36 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Ken Vandine <[e-mail]>
+ * Jonas G. Drange <[e-mail]>
+ *
+*/
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Column {
+
+    property var sim
+    property string carrierName: sim.netReg.name
+    property string carrierString: carrierName ? carrierName : i18n.tr("SIM")
+
+    ListItem.Standard {
+        objectName: "callFwd"
+        text: i18n.tr("Call forwarding")
+        progression: true
+        onClicked: pageStack.push(Qt.resolvedUrl("CallForwarding.qml"), {sim: sim})
+    }
+
+    ListItem.Standard {
+        objectName: "callWait"
+        text: i18n.tr("Call waiting")
+        progression: true
+        onClicked: pageStack.push(Qt.resolvedUrl("CallWaiting.qml"), {sim: sim})
+        showDivider: false
+    }
+
+    ListItem.Divider {}
+
+    ListItem.Standard {
+        objectName: "simServices"
+        // TRANSLATORS: %1 is the name of the (network) carrier
+        text: i18n.tr("%1 Services").arg(carrierString)
+        progression: true
+        enabled: sim.simMng.present
+        onClicked: pageStack.push(Qt.resolvedUrl("Services.qml"),
+                                  {carrierString: carrierString, sim: sim.simMng})
+    }
+}

=== added file 'plugins/phone/sims.js'
--- plugins/phone/sims.js	1970-01-01 00:00:00 +0000
+++ plugins/phone/sims.js	2014-08-26 21:07:36 +0000
@@ -0,0 +1,34 @@
+var sims = [];
+
+function add (sim) {
+    sims.push(sim);
+    root.simsLoaded++;
+}
+
+function getAll () {
+    return sims;
+}
+
+function get (n) {
+    return getAll()[n];
+}
+
+function getCount () {
+    return getAll().length;
+}
+
+function getPresent () {
+    var present = [];
+    getAll().forEach(function (sim) {
+        if (sim.present) {
+            present.push(sim);
+        } else {
+            return;
+        }
+    });
+    return present;
+}
+
+function getPresentCount () {
+    return getPresent().length;
+}

=== modified file 'plugins/security-privacy/LockSecurity.qml'
--- plugins/security-privacy/LockSecurity.qml	2014-08-12 08:37:44 +0000
+++ plugins/security-privacy/LockSecurity.qml	2014-08-26 21:07:36 +0000
@@ -89,9 +89,9 @@
                         changeSecurityDialog.oldMethod) { // Changing existing
                     switch (changeSecurityDialog.newMethod) {
                     case UbuntuSecurityPrivacyPanel.Passcode:
-                        return i18n.tr("Change passcode")
+                        return i18n.tr("Change passcode…")
                     case UbuntuSecurityPrivacyPanel.Passphrase:
-                        return i18n.tr("Change passphrase")
+                        return i18n.tr("Change passphrase…")
                     default: // To stop the runtime complaining
                         return ""
                     }
@@ -390,6 +390,7 @@
 
                 onClicked: openDialog()
             }
+            showDivider: false
         }
     }
 }

=== modified file 'plugins/security-privacy/PageComponent.qml'
--- plugins/security-privacy/PageComponent.qml	2014-08-11 11:05:58 +0000
+++ plugins/security-privacy/PageComponent.qml	2014-08-26 21:07:36 +0000
@@ -24,15 +24,20 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import SystemSettings 1.0
+import Ubuntu.SystemSettings.Battery 1.0
 import Ubuntu.SystemSettings.Diagnostics 1.0
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 
 ItemPage {
     id: root
+    objectName: "securityPrivacyPage"
 
     title: i18n.tr("Security & Privacy")
     flickable: scrollWidget
 
+    property alias usePowerd: batteryBackend.powerdRunning
+    property bool lockOnSuspend
+
     UbuntuDiagnostics {
         id: diagnosticsWidget
     }
@@ -41,6 +46,10 @@
         id: securityPrivacy
     }
 
+    UbuntuBatteryPanel {
+        id: batteryBackend
+    }
+
     GSettings {
         id: unitySettings
         schema.id: "com.canonical.Unity.Lenses"
@@ -53,6 +62,11 @@
         }
     }
 
+    GSettings {
+        id: powerSettings
+        schema.id: usePowerd ? "com.ubuntu.touch.system" : "org.gnome.desktop.session"
+    }
+
     Flickable {
         id: scrollWidget
         anchors.fill: parent
@@ -68,42 +82,34 @@
 
             ListItem.Standard {
                 id: securityTitle
-                text: i18n.tr("Security:")
-                // visible: lockingControl.visible || simControl.visible
-            }
-            /* When more of the phone locking page is implemented, we can
-             * remove the next item below, which is a duplicate of an item in
-             * PhoneLocking.qml, and uncomment the visible line above. */
+                text: i18n.tr("Security")
+            }            
             ListItem.SingleValue {
-                property string swipe: i18n.tr("None")
-                property string passcode: i18n.tr("Passcode")
-                property string passphrase: i18n.tr("Passphrase")
-
-                text: i18n.tr("Lock security")
+                id: lockingControl
+                objectName: "lockingControl"
+                text: i18n.tr("Lock phone")
                 value: {
-                    switch (securityPrivacy.securityType) {
-                        case UbuntuSecurityPrivacyPanel.Swipe:
-                            return swipe
-                        case UbuntuSecurityPrivacyPanel.Passcode:
-                            return passcode
-                        case UbuntuSecurityPrivacyPanel.Passphrase:
-                            return passphrase
+                    if (batteryBackend.powerdRunning ) {
+                        var timeout = Math.round(powerSettings.activityTimeout/60)
+                        return (powerSettings.activityTimeout != 0) ?
+                                    // TRANSLATORS: %1 is the number of minutes
+                                    i18n.tr("After %1 minute",
+                                            "After %1 minutes",
+                                            timeout).arg(timeout) :
+                                    i18n.tr("Never")
+                    }
+                    else {
+                        var timeout = Math.round(powerSettings.idleDelay/60)
+                        return (powerSettings.idleDelay != 0) ?
+                                    // TRANSLATORS: %1 is the number of minutes
+                                    i18n.tr("After %1 minute",
+                                            "After %1 minutes",
+                                            timeout).arg(timeout) :
+                                    i18n.tr("Manually")
                     }
                 }
                 progression: true
-                onClicked: pageStack.push(Qt.resolvedUrl("LockSecurity.qml"))
-                visible: !showAllUI
-            }
-            ListItem.SingleValue {
-                id: lockingControl
-                text: i18n.tr("Phone locking")
-                // TRANSLATORS: %1 is the number of minutes
-                value: i18n.tr("%1 minute",
-                               "%1 minutes",
-                               5).arg(5)
-                progression: true
-                onClicked: pageStack.push(Qt.resolvedUrl("PhoneLocking.qml"))
-                visible: showAllUI
+                onClicked: pageStack.push(Qt.resolvedUrl("PhoneLocking.qml"), {usePowerd: usePowerd, powerSettings: powerSettings})
             }
             ListItem.SingleValue {
                 id: simControl
@@ -111,10 +117,22 @@
                 value: "Off"
                 progression: true
                 visible: showAllUI
-            }
-            ListItem.Standard {
-                text: i18n.tr("Privacy:")
-                visible: securityTitle.visible
+                /* Not implemented yet */
+                //onClicked: pageStack.push(Qt.resolvedUrl("SimPin.qml"))
+            }
+            ListItem.Standard {
+                text: i18n.tr("Encryption")
+                control: Switch {
+                    id: encryptionSwitch
+                    checked: false
+                }
+            }
+            ListItem.Caption {
+                text: i18n.tr(
+                        "Encryption protects against access to phone data when the phone is connected to a PC or other device.")
+            }
+            ListItem.Standard {
+                text: i18n.tr("Privacy")
             }
             ListItem.Standard {
                 text: i18n.tr("Stats on welcome screen")
@@ -164,7 +182,8 @@
             }
             ListItem.SingleValue {
                 text: i18n.tr("Location access")
-                value: "On"
+                value: locationActionGroup.enabled.state ?
+                           i18n.tr("On") : i18n.tr("Off")
                 progression: true
                 onClicked: pageStack.push(Qt.resolvedUrl("Location.qml"))
                 visible: showAllUI && // Hidden until the indicator works
@@ -190,7 +209,6 @@
                     pageStack.push(Qt.resolvedUrl(path));
                 }
             }
-
         }
     }
 }

=== modified file 'plugins/security-privacy/PhoneLocking.qml'
--- plugins/security-privacy/PhoneLocking.qml	2014-06-24 18:50:41 +0000
+++ plugins/security-privacy/PhoneLocking.qml	2014-08-26 21:07:36 +0000
@@ -26,8 +26,13 @@
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 
 ItemPage {
+    id: root
+    objectName: "phoneLockingPage"
     title: i18n.tr("Phone locking")
 
+    property bool usePowerd
+    property variant powerSettings
+
     UbuntuSecurityPrivacyPanel {
         id: securityPrivacy
     }
@@ -57,14 +62,31 @@
         }
 
         ListItem.SingleValue {
+            objectName: "lockTimeout"
             property bool lockOnSuspend: securityPrivacy.securityType !==
                                             UbuntuSecurityPrivacyPanel.Swipe
             text: lockOnSuspend ? i18n.tr("Lock when idle")
                                 : i18n.tr("Sleep when idle")
-            // TRANSLATORS: %1 is the number of minutes
-            value: i18n.tr("%1 minute",
-                           "%1 minutes",
-                           5).arg(5)
+            value: {
+                if (usePowerd) {
+                    var timeout = Math.round(powerSettings.activityTimeout/60)
+                    return (powerSettings.activityTimeout != 0) ?
+                                // TRANSLATORS: %1 is the number of minutes
+                                i18n.tr("%1 minute",
+                                        "%1 minutes",
+                                        timeout).arg(timeout) :
+                                i18n.tr("Never")
+                }
+                else {
+                    var timeout = Math.round(powerSettings.idleDelay/60)
+                    return (powerSettings.idleDelay != 0) ?
+                                // TRANSLATORS: %1 is the number of minutes
+                                i18n.tr("%1 minute",
+                                        "%1 minutes",
+                                        timeout).arg(timeout) :
+                                i18n.tr("Never")
+                }
+            }
             progression: true
             onClicked:
                 pageStack.push(

=== modified file 'plugins/security-privacy/trust-store-model.cpp'
--- plugins/security-privacy/trust-store-model.cpp	2014-08-19 13:00:15 +0000
+++ plugins/security-privacy/trust-store-model.cpp	2014-08-26 21:07:36 +0000
@@ -179,7 +179,7 @@
     Q_Q(TrustStoreModel);
 
     Q_ASSERT(trustStore);
-    Q_ASSERT(row >= 0 && row < d->applications.count());
+    Q_ASSERT(row >= 0 && row < applications.count());
 
     Application &app = applications[row];
     app.grantedFeatures.clear();

=== modified file 'plugins/system-update/update_manager.cpp'
--- plugins/system-update/update_manager.cpp	2014-05-13 14:30:04 +0000
+++ plugins/system-update/update_manager.cpp	2014-08-26 21:07:36 +0000
@@ -40,7 +40,8 @@
     QObject(parent),
     m_systemCheckingUpdate(false),
     m_clickCheckingUpdate(false),
-    m_checkingUpdates(0)
+    m_checkingUpdates(0),
+    m_downloadMode(-1)
 {
     // SSO SERVICE
     QObject::connect(&m_service, SIGNAL(credentialsFound(const Token&)),

=== modified file 'plugins/time-date/timezonelocationmodel.cpp'
--- plugins/time-date/timezonelocationmodel.cpp	2014-06-11 13:05:23 +0000
+++ plugins/time-date/timezonelocationmodel.cpp	2014-08-26 21:07:36 +0000
@@ -134,6 +134,7 @@
         return QVariant();
         break;
     }
+    throw "Unreachable code";
 }
 
 QHash<int, QByteArray> TimeZoneLocationModel::roleNames() const
@@ -193,11 +194,10 @@
     TzDB *tzdb = tz_load_db();
     GPtrArray *tz_locations = tz_get_locations(tzdb);
 
-    CcTimezoneLocation *tmp;
     TimeZoneLocationModel::TzLocation tmpTz;
 
     for (guint i = 0; i < tz_locations->len; ++i) {
-        tmp = (CcTimezoneLocation *) g_ptr_array_index(tz_locations, i);
+        auto tmp = static_cast<CcTimezoneLocation *>(g_ptr_array_index(tz_locations, i));
         gchar *en_name, *country, *zone, *state, *full_country;
         g_object_get (tmp, "en_name", &en_name,
                            "country", &country,

=== modified file 'po/am.po'
--- po/am.po	2014-08-22 07:38:19 +0000
+++ po/am.po	2014-08-26 21:07:36 +0000
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2014-08-22 07:37+0000\n"
+"X-Launchpad-Export-Date: 2014-08-23 07:14+0000\n"
 "X-Generator: Launchpad (build 17163)\n"
 
 #: ../plugins/language//SpellChecking.qml:27

=== modified file 'po/en_AU.po'
--- po/en_AU.po	2014-08-20 06:22:04 +0000
+++ po/en_AU.po	2014-08-26 21:07:36 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: ubuntu-system-settings\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-15 19:11-0600\n"
-"PO-Revision-Date: 2014-08-13 02:03+0000\n"
+"PO-Revision-Date: 2014-08-23 02:38+0000\n"
 "Last-Translator: Jared Norris <[e-mail]>\n"
 "Language-Team: English (Australia) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-20 06:21+0000\n"
+"X-Launchpad-Export-Date: 2014-08-24 06:45+0000\n"
 "X-Generator: Launchpad (build 17163)\n"
 
 #: ../plugins/language//SpellChecking.qml:27
@@ -50,7 +50,7 @@
 
 #: ../plugins/language//PageComponent.qml:128
 msgid "Auto correction"
-msgstr ""
+msgstr "Auto correction"
 
 #: ../plugins/language//PageComponent.qml:138
 msgid "Word suggestions"
@@ -66,12 +66,13 @@
 
 #: ../plugins/language//PageComponent.qml:168
 msgid "Auto punctuation"
-msgstr ""
+msgstr "Auto punctuation"
 
 #: ../plugins/language//PageComponent.qml:178
 msgid ""
 "Adds a period, and any missing quotes or brackets, when you tap Space twice."
 msgstr ""
+"Adds a period, and any missing quotes or brackets, when you tap Space twice."
 
 #: ../plugins/language//PageComponent.qml:185
 #: ../plugins/sound//PageComponent.qml:186
@@ -80,7 +81,7 @@
 
 #: ../plugins/language//PageComponent.qml:195
 msgid "Keyboard vibration"
-msgstr ""
+msgstr "Keyboard vibration"
 
 #: ../plugins/language//KeyboardLayouts.qml:39
 msgid "Current layouts:"
@@ -310,7 +311,7 @@
 
 #: ../plugins/security-privacy//AppAccess.qml:35
 msgid "Apps that you have granted and have requested access to:"
-msgstr ""
+msgstr "Apps that you have granted and have requested access to:"
 
 #: ../plugins/security-privacy//AppAccess.qml:41
 #: ../plugins/bluetooth//PageComponent.qml:100
@@ -319,24 +320,24 @@
 
 #: ../plugins/security-privacy//AppAccess.qml:42
 msgid "Apps that have requested access to your camera"
-msgstr ""
+msgstr "Apps that have requested access to your camera"
 
 #: ../plugins/security-privacy//AppAccess.qml:46
 msgid "Mic"
-msgstr ""
+msgstr "Mic"
 
 #: ../plugins/security-privacy//AppAccess.qml:47
 msgid "Apps that have requested access to your mic"
-msgstr ""
+msgstr "Apps that have requested access to your mic"
 
 #: ../plugins/security-privacy//AppAccess.qml:59
 #, qt-format
 msgid "%1/%2"
-msgstr ""
+msgstr "%1/%2"
 
 #: ../plugins/security-privacy//AppAccess.qml:60
 msgid "0"
-msgstr ""
+msgstr "0"
 
 #: ../plugins/security-privacy//LockSecurity.qml:92
 msgid "Change passcode"
@@ -1075,7 +1076,7 @@
 #: ../plugins/battery//PageComponent.qml:290
 #: ../plugins/brightness//BrightnessSlider.qml:51
 msgid "Display brightness"
-msgstr ""
+msgstr "Display brightness"
 
 #. TRANSLATORS: %1 is the number of minutes
 #: ../plugins/battery//PageComponent.qml:306
@@ -1418,7 +1419,7 @@
 
 #: ../plugins/brightness//PageComponent.qml:65
 msgid "Brightens and dims the display to suit the surroundings."
-msgstr ""
+msgstr "Brightens and dims the display to suit the surroundings."
 
 #. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
 #: ../plugins/sound//PageComponent.qml:38
@@ -1564,27 +1565,27 @@
 
 #: ../wizard/qml/Pages//15-passwd.qml:37
 msgid "Set lock security"
-msgstr ""
+msgstr "Set lock security"
 
 #: ../wizard/qml/Pages//15-passwd.qml:86
 msgid "Swipe"
-msgstr ""
+msgstr "Swipe"
 
 #: ../wizard/qml/Pages//15-passwd.qml:136
 msgid "Those passcodes don't match."
-msgstr ""
+msgstr "Those passcodes don't match."
 
 #: ../wizard/qml/Pages//15-passwd.qml:138
 msgid "Those passphrases don't match."
-msgstr ""
+msgstr "Those passphrases don't match."
 
 #: ../wizard/qml/Pages//15-passwd.qml:146
 msgid "Passcode must be at least four digits long."
-msgstr ""
+msgstr "Passcode must be at least four digits long."
 
 #: ../wizard/qml/Pages//15-passwd.qml:148
 msgid "Passphrase must be at least four characters long."
-msgstr ""
+msgstr "Passphrase must be at least four characters long."
 
 #: ../wizard/qml/Pages//10-welcome.qml:25
 msgid "Hello"
@@ -1890,8 +1891,8 @@
 
 #: ../push-helper/software-updates-helper.py:78
 msgid "There's an updated system image."
-msgstr ""
+msgstr "There's an updated system image."
 
 #: ../push-helper/software-updates-helper.py:79
 msgid "Tap to open the system updater."
-msgstr ""
+msgstr "Tap to open the system updater."

=== modified file 'po/en_GB.po'
--- po/en_GB.po	2014-08-20 06:22:04 +0000
+++ po/en_GB.po	2014-08-26 21:07:36 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: ubuntu-system-settings\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-15 19:11-0600\n"
-"PO-Revision-Date: 2014-08-12 12:45+0000\n"
+"PO-Revision-Date: 2014-08-22 11:37+0000\n"
 "Last-Translator: Alan Pope ㋛ <[e-mail]>\n"
 "Language-Team: English (United Kingdom) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-20 06:21+0000\n"
+"X-Launchpad-Export-Date: 2014-08-23 07:15+0000\n"
 "X-Generator: Launchpad (build 17163)\n"
 
 #: ../plugins/language//SpellChecking.qml:27
@@ -50,7 +50,7 @@
 
 #: ../plugins/language//PageComponent.qml:128
 msgid "Auto correction"
-msgstr ""
+msgstr "Auto correction"
 
 #: ../plugins/language//PageComponent.qml:138
 msgid "Word suggestions"
@@ -66,12 +66,14 @@
 
 #: ../plugins/language//PageComponent.qml:168
 msgid "Auto punctuation"
-msgstr ""
+msgstr "Auto punctuation"
 
 #: ../plugins/language//PageComponent.qml:178
 msgid ""
 "Adds a period, and any missing quotes or brackets, when you tap Space twice."
 msgstr ""
+"Adds a full-stop, and any missing quotes or brackets, when you tap Space "
+"twice."
 
 #: ../plugins/language//PageComponent.qml:185
 #: ../plugins/sound//PageComponent.qml:186
@@ -80,7 +82,7 @@
 
 #: ../plugins/language//PageComponent.qml:195
 msgid "Keyboard vibration"
-msgstr ""
+msgstr "Keyboard vibration"
 
 #: ../plugins/language//KeyboardLayouts.qml:39
 msgid "Current layouts:"
@@ -310,7 +312,7 @@
 
 #: ../plugins/security-privacy//AppAccess.qml:35
 msgid "Apps that you have granted and have requested access to:"
-msgstr ""
+msgstr "Apps that you have granted and have requested access to:"
 
 #: ../plugins/security-privacy//AppAccess.qml:41
 #: ../plugins/bluetooth//PageComponent.qml:100
@@ -319,24 +321,24 @@
 
 #: ../plugins/security-privacy//AppAccess.qml:42
 msgid "Apps that have requested access to your camera"
-msgstr ""
+msgstr "Apps that have requested access to your camera"
 
 #: ../plugins/security-privacy//AppAccess.qml:46
 msgid "Mic"
-msgstr ""
+msgstr "Mic"
 
 #: ../plugins/security-privacy//AppAccess.qml:47
 msgid "Apps that have requested access to your mic"
-msgstr ""
+msgstr "Apps that have requested access to your mic"
 
 #: ../plugins/security-privacy//AppAccess.qml:59
 #, qt-format
 msgid "%1/%2"
-msgstr ""
+msgstr "%1/%2"
 
 #: ../plugins/security-privacy//AppAccess.qml:60
 msgid "0"
-msgstr ""
+msgstr "0"
 
 #: ../plugins/security-privacy//LockSecurity.qml:92
 msgid "Change passcode"
@@ -1075,7 +1077,7 @@
 #: ../plugins/battery//PageComponent.qml:290
 #: ../plugins/brightness//BrightnessSlider.qml:51
 msgid "Display brightness"
-msgstr ""
+msgstr "Display brightness"
 
 #. TRANSLATORS: %1 is the number of minutes
 #: ../plugins/battery//PageComponent.qml:306
@@ -1418,7 +1420,7 @@
 
 #: ../plugins/brightness//PageComponent.qml:65
 msgid "Brightens and dims the display to suit the surroundings."
-msgstr ""
+msgstr "Brightens and dims the display to suit the surroundings."
 
 #. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
 #: ../plugins/sound//PageComponent.qml:38
@@ -1564,27 +1566,27 @@
 
 #: ../wizard/qml/Pages//15-passwd.qml:37
 msgid "Set lock security"
-msgstr ""
+msgstr "Set lock security"
 
 #: ../wizard/qml/Pages//15-passwd.qml:86
 msgid "Swipe"
-msgstr ""
+msgstr "Swipe"
 
 #: ../wizard/qml/Pages//15-passwd.qml:136
 msgid "Those passcodes don't match."
-msgstr ""
+msgstr "Those passcodes don't match."
 
 #: ../wizard/qml/Pages//15-passwd.qml:138
 msgid "Those passphrases don't match."
-msgstr ""
+msgstr "Those passphrases don't match."
 
 #: ../wizard/qml/Pages//15-passwd.qml:146
 msgid "Passcode must be at least four digits long."
-msgstr ""
+msgstr "Passcode must be at least four digits long."
 
 #: ../wizard/qml/Pages//15-passwd.qml:148
 msgid "Passphrase must be at least four characters long."
-msgstr ""
+msgstr "Passphrase must be at least four characters long."
 
 #: ../wizard/qml/Pages//10-welcome.qml:25
 msgid "Hello"
@@ -1890,8 +1892,8 @@
 
 #: ../push-helper/software-updates-helper.py:78
 msgid "There's an updated system image."
-msgstr ""
+msgstr "There's an updated system image."
 
 #: ../push-helper/software-updates-helper.py:79
 msgid "Tap to open the system updater."
-msgstr ""
+msgstr "Tap to open the system updater."

=== modified file 'po/es.po'
--- po/es.po	2014-08-20 06:22:04 +0000
+++ po/es.po	2014-08-26 21:07:36 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: ubuntu-system-settings\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-15 19:11-0600\n"
-"PO-Revision-Date: 2014-08-16 13:20+0000\n"
-"Last-Translator: Adolfo Jayme <[e-mail]>\n"
+"PO-Revision-Date: 2014-08-24 05:35+0000\n"
+"Last-Translator: Leo Arias <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-20 06:21+0000\n"
+"X-Launchpad-Export-Date: 2014-08-25 08:05+0000\n"
 "X-Generator: Launchpad (build 17163)\n"
 
 #: ../plugins/language//SpellChecking.qml:27
@@ -50,7 +50,7 @@
 
 #: ../plugins/language//PageComponent.qml:128
 msgid "Auto correction"
-msgstr ""
+msgstr "Corrección automática"
 
 #: ../plugins/language//PageComponent.qml:138
 msgid "Word suggestions"
@@ -66,7 +66,7 @@
 
 #: ../plugins/language//PageComponent.qml:168
 msgid "Auto punctuation"
-msgstr ""
+msgstr "Puntuación automática"
 
 #: ../plugins/language//PageComponent.qml:178
 msgid ""

=== modified file 'po/fi.po'
--- po/fi.po	2014-08-20 06:22:04 +0000
+++ po/fi.po	2014-08-26 21:07:36 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: ubuntu-system-settings\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-15 19:11-0600\n"
-"PO-Revision-Date: 2014-08-18 07:37+0000\n"
+"PO-Revision-Date: 2014-08-22 09:53+0000\n"
 "Last-Translator: Timo Jyrinki <[e-mail]>\n"
 "Language-Team: Finnish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-20 06:19+0000\n"
+"X-Launchpad-Export-Date: 2014-08-23 07:15+0000\n"
 "X-Generator: Launchpad (build 17163)\n"
 
 #: ../plugins/language//SpellChecking.qml:27
@@ -50,7 +50,7 @@
 
 #: ../plugins/language//PageComponent.qml:128
 msgid "Auto correction"
-msgstr ""
+msgstr "Automaattinen korjaus"
 
 #: ../plugins/language//PageComponent.qml:138
 msgid "Word suggestions"
@@ -66,12 +66,14 @@
 
 #: ../plugins/language//PageComponent.qml:168
 msgid "Auto punctuation"
-msgstr ""
+msgstr "Automaattiset välimerkit"
 
 #: ../plugins/language//PageComponent.qml:178
 msgid ""
 "Adds a period, and any missing quotes or brackets, when you tap Space twice."
 msgstr ""
+"Lisää pisteen sekä puuttuvat lainausmerkit ja sulut, kun painat välilyöntiä "
+"kahdesti."
 
 #: ../plugins/language//PageComponent.qml:185
 #: ../plugins/sound//PageComponent.qml:186
@@ -80,7 +82,7 @@
 
 #: ../plugins/language//PageComponent.qml:195
 msgid "Keyboard vibration"
-msgstr ""
+msgstr "Näppäimistön värinä"
 
 #: ../plugins/language//KeyboardLayouts.qml:39
 msgid "Current layouts:"
@@ -148,14 +150,14 @@
 #: ../plugins/security-privacy//PhoneLocking.qml:41
 #: ../wizard/qml/Pages//15-passwd.qml:88
 msgid "Passcode"
-msgstr "Pääsykoodi"
+msgstr "Suojakoodi"
 
 #: ../plugins/security-privacy//PageComponent.qml:80
 #: ../plugins/security-privacy//PhoneLocking.qml:42
 #: ../plugins/security-privacy//LockSecurity.qml:346
 #: ../wizard/qml/Pages//15-passwd.qml:90
 msgid "Passphrase"
-msgstr "Avainlause"
+msgstr "Salasana"
 
 #: ../plugins/security-privacy//PageComponent.qml:82
 #: ../plugins/security-privacy//PhoneLocking.qml:44
@@ -312,7 +314,7 @@
 
 #: ../plugins/security-privacy//AppAccess.qml:35
 msgid "Apps that you have granted and have requested access to:"
-msgstr ""
+msgstr "Sovellukset, jotka ovat pyytäneet ja joille on annettu oikeudet:"
 
 #: ../plugins/security-privacy//AppAccess.qml:41
 #: ../plugins/bluetooth//PageComponent.qml:100
@@ -321,32 +323,32 @@
 
 #: ../plugins/security-privacy//AppAccess.qml:42
 msgid "Apps that have requested access to your camera"
-msgstr ""
+msgstr "Sovellukset jotka ovat pyytäneet pääsyä kameraan"
 
 #: ../plugins/security-privacy//AppAccess.qml:46
 msgid "Mic"
-msgstr ""
+msgstr "Mikrofoni"
 
 #: ../plugins/security-privacy//AppAccess.qml:47
 msgid "Apps that have requested access to your mic"
-msgstr ""
+msgstr "Sovellukset jotka ovat pyytäneet pääsyä mikrofoniin"
 
 #: ../plugins/security-privacy//AppAccess.qml:59
 #, qt-format
 msgid "%1/%2"
-msgstr ""
+msgstr "%1/%2"
 
 #: ../plugins/security-privacy//AppAccess.qml:60
 msgid "0"
-msgstr ""
+msgstr "0"
 
 #: ../plugins/security-privacy//LockSecurity.qml:92
 msgid "Change passcode"
-msgstr "Vaihda pääsykoodi"
+msgstr "Vaihda suojakoodi"
 
 #: ../plugins/security-privacy//LockSecurity.qml:94
 msgid "Change passphrase"
-msgstr "Vaihda avainlause"
+msgstr "Vaihda salasanaa"
 
 #: ../plugins/security-privacy//LockSecurity.qml:101
 msgid "Switch to swipe"
@@ -354,43 +356,43 @@
 
 #: ../plugins/security-privacy//LockSecurity.qml:103
 msgid "Switch to passcode"
-msgstr "Vaihda pääsykoodiin"
+msgstr "Vaihda suojakoodiin"
 
 #: ../plugins/security-privacy//LockSecurity.qml:105
 msgid "Switch to passphrase"
-msgstr "Vaihda avainlauseeseen"
+msgstr "Vaihda salasanaan"
 
 #: ../plugins/security-privacy//LockSecurity.qml:114
 msgid "Existing passcode"
-msgstr "Nykyinen pääsykoodi"
+msgstr "Nykyinen suojakoodi"
 
 #: ../plugins/security-privacy//LockSecurity.qml:116
 msgid "Existing passphrase"
-msgstr "Nykyinen avainlause"
+msgstr "Nykyinen salasana"
 
 #: ../plugins/security-privacy//LockSecurity.qml:170
 msgid "Choose passcode"
-msgstr "Valitse pääsykoodi"
+msgstr "Valitse suojakoodi"
 
 #: ../plugins/security-privacy//LockSecurity.qml:172
 msgid "Choose passphrase"
-msgstr "Valitse avainlause"
+msgstr "Valitse salasana"
 
 #: ../plugins/security-privacy//LockSecurity.qml:216
 msgid "Confirm passcode"
-msgstr "Vahvista pääsykoodi"
+msgstr "Vahvista suojakoodi"
 
 #: ../plugins/security-privacy//LockSecurity.qml:218
 msgid "Confirm passphrase"
-msgstr "Vahvista avainlause"
+msgstr "Vahvista salasana"
 
 #: ../plugins/security-privacy//LockSecurity.qml:261
 msgid "Those passcodes don't match. Try again."
-msgstr "Pääsykoodit eivät vastaa toisiaan. Yritä uudelleen."
+msgstr "Suojakoodit eivät vastaa toisiaan. Yritä uudelleen."
 
 #: ../plugins/security-privacy//LockSecurity.qml:264
 msgid "Those passphrases don't match. Try again."
-msgstr "Avainlauseet eivät vastaa toisiaan. Yritä uudelleen."
+msgstr "Salasanat eivät vastaa toisiaan. Yritä uudelleen."
 
 #: ../plugins/security-privacy//LockSecurity.qml:295
 msgid "Unset"
@@ -418,7 +420,7 @@
 
 #: ../plugins/security-privacy//LockSecurity.qml:345
 msgid "4-digit passcode"
-msgstr "4-numeroinen pääsykoodi"
+msgstr "4-numeroinen suojakoodi"
 
 #: ../plugins/security-privacy//LockSecurity.qml:347
 msgid "Swipe (no security)… "
@@ -426,19 +428,19 @@
 
 #: ../plugins/security-privacy//LockSecurity.qml:348
 msgid "4-digit passcode…"
-msgstr "Nelinumeroinen pääsykoodi…"
+msgstr "Nelinumeroinen suojakoodi…"
 
 #: ../plugins/security-privacy//LockSecurity.qml:349
 msgid "Passphrase…"
-msgstr "Avainlause…"
+msgstr "Salasana…"
 
 #: ../plugins/security-privacy//LockSecurity.qml:380
 msgid "Change passcode…"
-msgstr "Vaihda pääsykoodi…"
+msgstr "Vaihda suojakoodi…"
 
 #: ../plugins/security-privacy//LockSecurity.qml:381
 msgid "Change passphrase…"
-msgstr "Vaihda avainlause…"
+msgstr "Vaihda salasana…"
 
 #: ../plugins/security-privacy//Dash.qml:45
 msgid "Return results from:"
@@ -841,7 +843,7 @@
 
 #: ../plugins/about//DevMode.qml:98
 msgid "You need a passcode or passphrase set to use Developer Mode."
-msgstr "Tarvitset kehittäjätilaa varten tunnuskoodin tai salasanan."
+msgstr "Tarvitset kehittäjätilaa varten suojakoodin tai salasanan."
 
 #: ../plugins/about//Storage.qml:87
 msgid "Used by Ubuntu"
@@ -1077,7 +1079,7 @@
 #: ../plugins/battery//PageComponent.qml:290
 #: ../plugins/brightness//BrightnessSlider.qml:51
 msgid "Display brightness"
-msgstr ""
+msgstr "Näytön kirkkaus"
 
 #. TRANSLATORS: %1 is the number of minutes
 #: ../plugins/battery//PageComponent.qml:306
@@ -1421,7 +1423,7 @@
 
 #: ../plugins/brightness//PageComponent.qml:65
 msgid "Brightens and dims the display to suit the surroundings."
-msgstr ""
+msgstr "Näytön kirkkauden säätö ympäristöön sopivaksi"
 
 #. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
 #: ../plugins/sound//PageComponent.qml:38
@@ -1567,27 +1569,27 @@
 
 #: ../wizard/qml/Pages//15-passwd.qml:37
 msgid "Set lock security"
-msgstr ""
+msgstr "Aseta lukitustapa"
 
 #: ../wizard/qml/Pages//15-passwd.qml:86
 msgid "Swipe"
-msgstr ""
+msgstr "Pyyhkäisy"
 
 #: ../wizard/qml/Pages//15-passwd.qml:136
 msgid "Those passcodes don't match."
-msgstr ""
+msgstr "Suojakoodit eivät täsmää."
 
 #: ../wizard/qml/Pages//15-passwd.qml:138
 msgid "Those passphrases don't match."
-msgstr ""
+msgstr "Salasanat eivät täsmää."
 
 #: ../wizard/qml/Pages//15-passwd.qml:146
 msgid "Passcode must be at least four digits long."
-msgstr ""
+msgstr "Suojakoodin tulee olla vähintään neljä numeroa."
 
 #: ../wizard/qml/Pages//15-passwd.qml:148
 msgid "Passphrase must be at least four characters long."
-msgstr ""
+msgstr "Salasanan tulee olla vähintään neljä kirjainta."
 
 #: ../wizard/qml/Pages//10-welcome.qml:25
 msgid "Hello"
@@ -1893,8 +1895,8 @@
 
 #: ../push-helper/software-updates-helper.py:78
 msgid "There's an updated system image."
-msgstr ""
+msgstr "Päivitetty järjestelmäversio saatavilla."
 
 #: ../push-helper/software-updates-helper.py:79
 msgid "Tap to open the system updater."
-msgstr ""
+msgstr "Kosketa avataksesi järjestelmän päivityksen."

=== modified file 'po/fr.po'
--- po/fr.po	2014-08-22 07:38:19 +0000
+++ po/fr.po	2014-08-26 21:07:36 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: ubuntu-system-settings\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-15 19:11-0600\n"
-"PO-Revision-Date: 2014-08-21 19:05+0000\n"
+"PO-Revision-Date: 2014-08-24 14:24+0000\n"
 "Last-Translator: Anne <[e-mail]>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2014-08-22 07:38+0000\n"
+"X-Launchpad-Export-Date: 2014-08-25 08:05+0000\n"
 "X-Generator: Launchpad (build 17163)\n"
 "Language: \n"
 
@@ -75,6 +75,8 @@
 msgid ""
 "Adds a period, and any missing quotes or brackets, when you tap Space twice."
 msgstr ""
+"Ajoute un point, ainsi que les parenthèses ou les guillemets manquants, "
+"lorsque vous appuyez deux fois sur Espace."
 
 #: ../plugins/language//PageComponent.qml:185
 #: ../plugins/sound//PageComponent.qml:186

=== modified file 'po/gl.po'
--- po/gl.po	2014-08-22 07:38:19 +0000
+++ po/gl.po	2014-08-26 21:07:36 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: ubuntu-system-settings\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-15 19:11-0600\n"
-"PO-Revision-Date: 2014-08-21 14:17+0000\n"
+"PO-Revision-Date: 2014-08-23 20:46+0000\n"
 "Last-Translator: Marcos Lans <Unknown>\n"
 "Language-Team: Galician <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-22 07:38+0000\n"
+"X-Launchpad-Export-Date: 2014-08-24 06:45+0000\n"
 "X-Generator: Launchpad (build 17163)\n"
 "Language: Galician\n"
 
@@ -132,7 +132,7 @@
 #: ../plugins/security-privacy//PageComponent.qml:151
 #: ../plugins/security-privacy//Dash.qml:46
 msgid "Phone only"
-msgstr "Existente no teléfono"
+msgstr "Só do teléfono"
 
 #: ../plugins/security-privacy//PageComponent.qml:71
 msgid "Security:"
@@ -846,8 +846,8 @@
 #: ../plugins/about//DevMode.qml:98
 msgid "You need a passcode or passphrase set to use Developer Mode."
 msgstr ""
-"Precisa estabelecer unha clave ou frase secreta para usar o Modo "
-"Desenvolvedor"
+"Precisa estabelecer unha clave ou unha frase secreta para usar o Modo "
+"Desenvolvedor."
 
 #: ../plugins/about//Storage.qml:87
 msgid "Used by Ubuntu"
@@ -1586,7 +1586,7 @@
 
 #: ../wizard/qml/Pages//15-passwd.qml:138
 msgid "Those passphrases don't match."
-msgstr "As frases de paso non coinciden."
+msgstr "As frases secretas non coinciden."
 
 #: ../wizard/qml/Pages//15-passwd.qml:146
 msgid "Passcode must be at least four digits long."
@@ -1594,7 +1594,7 @@
 
 #: ../wizard/qml/Pages//15-passwd.qml:148
 msgid "Passphrase must be at least four characters long."
-msgstr "A frase de paso debe ter 4 caracteres como mínimo."
+msgstr "A frase secreta debe ter 4 caracteres como mínimo."
 
 #: ../wizard/qml/Pages//10-welcome.qml:25
 msgid "Hello"

=== modified file 'po/he.po'
--- po/he.po	2014-08-20 06:22:04 +0000
+++ po/he.po	2014-08-26 21:07:36 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: ubuntu-system-settings\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-15 19:11-0600\n"
-"PO-Revision-Date: 2014-07-30 13:16+0000\n"
+"PO-Revision-Date: 2014-08-23 11:41+0000\n"
 "Last-Translator: Yaron <[e-mail]>\n"
 "Language-Team: Hebrew <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-20 06:19+0000\n"
+"X-Launchpad-Export-Date: 2014-08-24 06:45+0000\n"
 "X-Generator: Launchpad (build 17163)\n"
 
 #: ../plugins/language//SpellChecking.qml:27
@@ -50,7 +50,7 @@
 
 #: ../plugins/language//PageComponent.qml:128
 msgid "Auto correction"
-msgstr ""
+msgstr "תיקון אוטומטי"
 
 #: ../plugins/language//PageComponent.qml:138
 msgid "Word suggestions"
@@ -66,12 +66,12 @@
 
 #: ../plugins/language//PageComponent.qml:168
 msgid "Auto punctuation"
-msgstr ""
+msgstr "פיסוק אוטומטי"
 
 #: ../plugins/language//PageComponent.qml:178
 msgid ""
 "Adds a period, and any missing quotes or brackets, when you tap Space twice."
-msgstr ""
+msgstr "הוספת נקודה וכל מרכאות או סוגריים חסרים בעת נגיעה כפולה ברווח."
 
 #: ../plugins/language//PageComponent.qml:185
 #: ../plugins/sound//PageComponent.qml:186
@@ -80,7 +80,7 @@
 
 #: ../plugins/language//PageComponent.qml:195
 msgid "Keyboard vibration"
-msgstr ""
+msgstr "רטט מקלדת"
 
 #: ../plugins/language//KeyboardLayouts.qml:39
 msgid "Current layouts:"
@@ -310,7 +310,7 @@
 
 #: ../plugins/security-privacy//AppAccess.qml:35
 msgid "Apps that you have granted and have requested access to:"
-msgstr ""
+msgstr "יישומים שאישרת וביקשו לגשת אל:"
 
 #: ../plugins/security-privacy//AppAccess.qml:41
 #: ../plugins/bluetooth//PageComponent.qml:100
@@ -319,24 +319,24 @@
 
 #: ../plugins/security-privacy//AppAccess.qml:42
 msgid "Apps that have requested access to your camera"
-msgstr ""
+msgstr "יישומים שביקשו לגשת למצלמה שלך"
 
 #: ../plugins/security-privacy//AppAccess.qml:46
 msgid "Mic"
-msgstr ""
+msgstr "מיקרופון"
 
 #: ../plugins/security-privacy//AppAccess.qml:47
 msgid "Apps that have requested access to your mic"
-msgstr ""
+msgstr "יישומים שביקשו לגשת למצלמה שלך"
 
 #: ../plugins/security-privacy//AppAccess.qml:59
 #, qt-format
 msgid "%1/%2"
-msgstr ""
+msgstr "%1/%2"
 
 #: ../plugins/security-privacy//AppAccess.qml:60
 msgid "0"
-msgstr ""
+msgstr "0"
 
 #: ../plugins/security-privacy//LockSecurity.qml:92
 msgid "Change passcode"

=== modified file 'po/hu.po'
--- po/hu.po	2014-08-22 07:38:19 +0000
+++ po/hu.po	2014-08-26 21:07:36 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: ubuntu-system-settings\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-15 19:11-0600\n"
-"PO-Revision-Date: 2014-08-21 19:21+0000\n"
+"PO-Revision-Date: 2014-08-25 08:04+0000\n"
 "Last-Translator: Richard Somlói <[e-mail]>\n"
 "Language-Team: Hungarian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2014-08-22 07:38+0000\n"
+"X-Launchpad-Export-Date: 2014-08-25 08:05+0000\n"
 "X-Generator: Launchpad (build 17163)\n"
 
 #: ../plugins/language//SpellChecking.qml:27
@@ -41,7 +41,7 @@
 
 #: ../plugins/language//PageComponent.qml:79
 msgid "Display language…"
-msgstr "Megjelenítési nyelv…"
+msgstr "Megjelenítés nyelve"
 
 #: ../plugins/language//PageComponent.qml:93
 #: ../plugins/language//KeyboardLayouts.qml:26
@@ -72,7 +72,7 @@
 msgid ""
 "Adds a period, and any missing quotes or brackets, when you tap Space twice."
 msgstr ""
-"Új mondatot kezd és hozzáad minden hiányzó idézőjelet vagy zárójelet ha "
+"Új mondatot kezd és hozzáad minden hiányzó idézőjelet vagy zárójelet, ha "
 "megérinti kétszer a Szóközt."
 
 #: ../plugins/language//PageComponent.qml:185
@@ -1534,7 +1534,7 @@
 "Your phone is set up to automatically report errors to Canonical. This can "
 "be disabled in system settings."
 msgstr ""
-"A telefonja automatikusan hibajelentéseket küld a Canonical-nak. Ezt a "
+"A telefonja automatikusan hibajelentéseket küld a Canonical felé. Ezt a "
 "rendszerbeállításokban kikapcsolhatja."
 
 #: ../wizard/qml/Pages//30-location.qml:41

=== modified file 'po/ro.po'
--- po/ro.po	2014-08-20 06:22:04 +0000
+++ po/ro.po	2014-08-26 21:07:36 +0000
@@ -8,15 +8,15 @@
 "Project-Id-Version: ubuntu-system-settings\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-15 19:11-0600\n"
-"PO-Revision-Date: 2014-08-12 14:39+0000\n"
-"Last-Translator: Marian Vasile <[e-mail]>\n"
+"PO-Revision-Date: 2014-08-24 16:50+0000\n"
+"Last-Translator: Meriuță Cornel <[e-mail]>\n"
 "Language-Team: Romanian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2014-08-20 06:20+0000\n"
+"X-Launchpad-Export-Date: 2014-08-25 08:05+0000\n"
 "X-Generator: Launchpad (build 17163)\n"
 
 #: ../plugins/language//SpellChecking.qml:27
@@ -51,7 +51,7 @@
 
 #: ../plugins/language//PageComponent.qml:128
 msgid "Auto correction"
-msgstr ""
+msgstr "Corecție automată"
 
 #: ../plugins/language//PageComponent.qml:138
 msgid "Word suggestions"
@@ -68,12 +68,14 @@
 
 #: ../plugins/language//PageComponent.qml:168
 msgid "Auto punctuation"
-msgstr ""
+msgstr "Punctuație automată"
 
 #: ../plugins/language//PageComponent.qml:178
 msgid ""
 "Adds a period, and any missing quotes or brackets, when you tap Space twice."
 msgstr ""
+"Adăugați o perioadă, și orice citate lipsă sau paranteze, atunci când "
+"atingeți Spațiu de două ori."
 
 #: ../plugins/language//PageComponent.qml:185
 #: ../plugins/sound//PageComponent.qml:186
@@ -82,7 +84,7 @@
 
 #: ../plugins/language//PageComponent.qml:195
 msgid "Keyboard vibration"
-msgstr ""
+msgstr "Vibrație tastatură"
 
 #: ../plugins/language//KeyboardLayouts.qml:39
 msgid "Current layouts:"
@@ -326,24 +328,24 @@
 
 #: ../plugins/security-privacy//AppAccess.qml:42
 msgid "Apps that have requested access to your camera"
-msgstr ""
+msgstr "Aplicații care au solicitat accesul la camera dumneavostră"
 
 #: ../plugins/security-privacy//AppAccess.qml:46
 msgid "Mic"
-msgstr ""
+msgstr "Microfon"
 
 #: ../plugins/security-privacy//AppAccess.qml:47
 msgid "Apps that have requested access to your mic"
-msgstr ""
+msgstr "Aplicații care au solicitat accesul la microfonul dumneavoastră"
 
 #: ../plugins/security-privacy//AppAccess.qml:59
 #, qt-format
 msgid "%1/%2"
-msgstr ""
+msgstr "%1/%2"
 
 #: ../plugins/security-privacy//AppAccess.qml:60
 msgid "0"
-msgstr ""
+msgstr "0"
 
 #: ../plugins/security-privacy//LockSecurity.qml:92
 msgid "Change passcode"
@@ -1090,7 +1092,7 @@
 #: ../plugins/battery//PageComponent.qml:290
 #: ../plugins/brightness//BrightnessSlider.qml:51
 msgid "Display brightness"
-msgstr ""
+msgstr "Luminozitate afișaj"
 
 #. TRANSLATORS: %1 is the number of minutes
 #: ../plugins/battery//PageComponent.qml:306
@@ -1594,11 +1596,11 @@
 
 #: ../wizard/qml/Pages//15-passwd.qml:136
 msgid "Those passcodes don't match."
-msgstr ""
+msgstr "Aceste coduri de acces nu se potrivesc."
 
 #: ../wizard/qml/Pages//15-passwd.qml:138
 msgid "Those passphrases don't match."
-msgstr ""
+msgstr "Aceste fraze secrete nu se potrivesc."
 
 #: ../wizard/qml/Pages//15-passwd.qml:146
 msgid "Passcode must be at least four digits long."
@@ -1912,8 +1914,8 @@
 
 #: ../push-helper/software-updates-helper.py:78
 msgid "There's an updated system image."
-msgstr ""
+msgstr "Există o imagine de sistem actualizată."
 
 #: ../push-helper/software-updates-helper.py:79
 msgid "Tap to open the system updater."
-msgstr ""
+msgstr "Atingeți pentru a deschide programul de actualizare a sistemului."

=== modified file 'po/uk.po'
--- po/uk.po	2014-08-20 06:22:04 +0000
+++ po/uk.po	2014-08-26 21:07:36 +0000
@@ -9,7 +9,7 @@
 "Project-Id-Version: ubuntu-system-settings\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-15 19:11-0600\n"
-"PO-Revision-Date: 2014-08-12 14:36+0000\n"
+"PO-Revision-Date: 2014-08-23 05:54+0000\n"
 "Last-Translator: Yuri Chornoivan <[e-mail]>\n"
 "Language-Team: Ukrainian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2014-08-20 06:21+0000\n"
+"X-Launchpad-Export-Date: 2014-08-24 06:45+0000\n"
 "X-Generator: Launchpad (build 17163)\n"
 "Language: uk\n"
 
@@ -53,7 +53,7 @@
 
 #: ../plugins/language//PageComponent.qml:128
 msgid "Auto correction"
-msgstr ""
+msgstr "Автовиправлення"
 
 #: ../plugins/language//PageComponent.qml:138
 msgid "Word suggestions"
@@ -69,12 +69,13 @@
 
 #: ../plugins/language//PageComponent.qml:168
 msgid "Auto punctuation"
-msgstr ""
+msgstr "Автопунктуація"
 
 #: ../plugins/language//PageComponent.qml:178
 msgid ""
 "Adds a period, and any missing quotes or brackets, when you tap Space twice."
 msgstr ""
+"Додає крапки, пропущені лапки та дужки після подвійного натискання Пробілу."
 
 #: ../plugins/language//PageComponent.qml:185
 #: ../plugins/sound//PageComponent.qml:186
@@ -83,7 +84,7 @@
 
 #: ../plugins/language//PageComponent.qml:195
 msgid "Keyboard vibration"
-msgstr ""
+msgstr "Клавіатурна вібрація"
 
 #: ../plugins/language//KeyboardLayouts.qml:39
 msgid "Current layouts:"
@@ -322,7 +323,7 @@
 
 #: ../plugins/security-privacy//AppAccess.qml:35
 msgid "Apps that you have granted and have requested access to:"
-msgstr ""
+msgstr "Програми, яким ви на запит надали доступ до:"
 
 #: ../plugins/security-privacy//AppAccess.qml:41
 #: ../plugins/bluetooth//PageComponent.qml:100
@@ -331,24 +332,24 @@
 
 #: ../plugins/security-privacy//AppAccess.qml:42
 msgid "Apps that have requested access to your camera"
-msgstr ""
+msgstr "Програми, які надіслали запит щодо користування камерою"
 
 #: ../plugins/security-privacy//AppAccess.qml:46
 msgid "Mic"
-msgstr ""
+msgstr "Мікрофон"
 
 #: ../plugins/security-privacy//AppAccess.qml:47
 msgid "Apps that have requested access to your mic"
-msgstr ""
+msgstr "Програми, які надіслали доступ щодо користування мікрофоном"
 
 #: ../plugins/security-privacy//AppAccess.qml:59
 #, qt-format
 msgid "%1/%2"
-msgstr ""
+msgstr "%1/%2"
 
 #: ../plugins/security-privacy//AppAccess.qml:60
 msgid "0"
-msgstr ""
+msgstr "0"
 
 #: ../plugins/security-privacy//LockSecurity.qml:92
 msgid "Change passcode"
@@ -1096,7 +1097,7 @@
 #: ../plugins/battery//PageComponent.qml:290
 #: ../plugins/brightness//BrightnessSlider.qml:51
 msgid "Display brightness"
-msgstr ""
+msgstr "Яскравість дисплея"
 
 #. TRANSLATORS: %1 is the number of minutes
 #: ../plugins/battery//PageComponent.qml:306
@@ -1443,7 +1444,7 @@
 
 #: ../plugins/brightness//PageComponent.qml:65
 msgid "Brightens and dims the display to suit the surroundings."
-msgstr ""
+msgstr "Коригує яскравість дисплея відповідно до зовнішнього освітлення."
 
 #. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
 #: ../plugins/sound//PageComponent.qml:38
@@ -1589,27 +1590,27 @@
 
 #: ../wizard/qml/Pages//15-passwd.qml:37
 msgid "Set lock security"
-msgstr ""
+msgstr "Захист блокуванням"
 
 #: ../wizard/qml/Pages//15-passwd.qml:86
 msgid "Swipe"
-msgstr ""
+msgstr "Рух пальцем"
 
 #: ../wizard/qml/Pages//15-passwd.qml:136
 msgid "Those passcodes don't match."
-msgstr ""
+msgstr "Коди-паролі не збігаються."
 
 #: ../wizard/qml/Pages//15-passwd.qml:138
 msgid "Those passphrases don't match."
-msgstr ""
+msgstr "Паролі не збігаються."
 
 #: ../wizard/qml/Pages//15-passwd.qml:146
 msgid "Passcode must be at least four digits long."
-msgstr ""
+msgstr "Код-пароль має складатися принаймні з чотирьох цифр."
 
 #: ../wizard/qml/Pages//15-passwd.qml:148
 msgid "Passphrase must be at least four characters long."
-msgstr ""
+msgstr "Пароль має складатися принаймні з чотирьох символів."
 
 #: ../wizard/qml/Pages//10-welcome.qml:25
 msgid "Hello"
@@ -1915,8 +1916,8 @@
 
 #: ../push-helper/software-updates-helper.py:78
 msgid "There's an updated system image."
-msgstr ""
+msgstr "Випущено оновлений образ системи."
 
 #: ../push-helper/software-updates-helper.py:79
 msgid "Tap to open the system updater."
-msgstr ""
+msgstr "Натисніть, щоб відкрити засіб оновлення системи."

=== modified file 'src/i18n.cpp'
--- src/i18n.cpp	2013-05-03 19:32:01 +0000
+++ src/i18n.cpp	2014-08-26 21:07:36 +0000
@@ -36,5 +36,5 @@
     return QString::fromUtf8(dgettext(domain, text));
 }
 
-}; // namespace
+} // namespace
 

=== modified file 'src/plugin-manager.cpp'
--- src/plugin-manager.cpp	2014-02-27 12:55:28 +0000
+++ src/plugin-manager.cpp	2014-08-26 21:07:36 +0000
@@ -32,7 +32,7 @@
 
 using namespace SystemSettings;
 
-static const QLatin1String baseDir(PLUGIN_MANIFEST_DIR);
+static const QLatin1String baseDir{PLUGIN_MANIFEST_DIR};
 
 namespace SystemSettings {
 

=== modified file 'src/plugin.cpp'
--- src/plugin.cpp	2014-03-03 16:02:44 +0000
+++ src/plugin.cpp	2014-08-26 21:07:36 +0000
@@ -37,8 +37,8 @@
 
 using namespace SystemSettings;
 
-static const QLatin1String pluginModuleDir(PLUGIN_MODULE_DIR);
-static const QLatin1String pluginQmlDir(PLUGIN_QML_DIR);
+static const QLatin1String pluginModuleDir{PLUGIN_MODULE_DIR};
+static const QLatin1String pluginQmlDir{PLUGIN_QML_DIR};
 
 namespace SystemSettings {
 
@@ -67,9 +67,9 @@
 PluginPrivate::PluginPrivate(Plugin *q, const QFileInfo &manifest):
     q_ptr(q),
     m_item(0),
-    m_baseName(manifest.completeBaseName()),
     m_plugin(0),
-    m_plugin2(0)
+    m_plugin2(0),
+    m_baseName(manifest.completeBaseName())
 {
     QFile file(manifest.filePath());
     if (Q_UNLIKELY(!file.open(QIODevice::ReadOnly | QIODevice::Text))) {

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2014-08-13 10:02:27 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2014-08-26 21:07:36 +0000
@@ -23,6 +23,7 @@
 
 from time import sleep
 
+from autopilot.input import Keyboard
 import autopilot.logging
 import ubuntuuitoolkit
 from autopilot import introspection, platform
@@ -102,6 +103,10 @@
         self.pointing_device.click_object(item)
 
     @autopilot.logging.log_action(logger.debug)
+    def go_to_phone_page(self):
+        return self._go_to_page('entryComponent-phone', 'phonePage')
+
+    @autopilot.logging.log_action(logger.debug)
     def go_to_reset_phone(self):
         return self._go_to_page('entryComponent-reset', 'resetPage')
 
@@ -166,6 +171,11 @@
         return self.select_single(objectName='soundPage')
 
     @property
+    def security_page(self):
+        """ Return 'Security' page """
+        return self.select_single(objectName='securityPrivacyPage')
+
+    @property
     def _orientation_lock_switch(self):
         return self.wait_select_single(
             ubuntuuitoolkit.CheckBox,
@@ -311,6 +321,146 @@
         return False
 
 
+class PhonePage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    """Autopilot helper for the Phone page."""
+
+    @classmethod
+    def validate_dbus_object(cls, path, state):
+        name = introspection.get_classname_from_path(path)
+        if name == b'PageComponent':
+            if state['objectName'][1] == 'phonePage':
+                return True
+        return False
+
+    @autopilot.logging.log_action(logger.info)
+    def go_to_call_forwarding(self, sim=None):
+        """Open the Call Forwarding settings page.
+
+        :param sim: Number of what SIM to use, either 1 or 2.
+            Required parameter in dual SIM setups
+        :returns: The Call Forwarding settings page.
+
+        """
+        find = "callFwd"
+        if sim:
+            find = "callFwdSim%d" % sim
+
+        return self._go_to_page(find, 'callForwardingPage')
+
+    def _go_to_page(self, item_object_name, page_object_name):
+        self._click_item(item_object_name)
+        page = self.get_root_instance().wait_select_single(
+            objectName=page_object_name)
+        page.active.wait_for(True)
+        return page
+
+    def _click_item(self, object_name):
+        item = self.select_single(objectName=object_name)
+        item.swipe_into_view()
+        self.pointing_device.click_object(item)
+
+    @autopilot.logging.log_action(logger.info)
+    def go_to_call_waiting(self, sim=None):
+        """Open the Call Waiting settings page.
+
+        :param sim: Number of what SIM to use, either 1 or 2.
+            Required parameter in dual SIM setups
+        :returns: The Call Waiting settings page.
+
+        """
+        find = "callWait"
+        if sim:
+            find = "callWaitSim%d" % sim
+        return self._go_to_page(find, 'callWaitingPage')
+
+    @autopilot.logging.log_action(logger.info)
+    def go_to_sim_services(self, sim=None):
+        """Open the SIM Services settings page.
+
+        :param sim: Number of what SIM to use, either 1 or 2.
+            Required parameter in dual SIM setups
+        :returns: The SIM Services settings page.
+
+        """
+        find = "simServices"
+        if sim:
+            find = "simServicesSim%d" % sim
+
+        return self._go_to_page(find, 'servicesPage')
+
+
+class CallWaiting(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    """Autopilot helper for the Call waiting page."""
+
+    @property
+    def _switch(self):
+        return self.wait_select_single(
+            ubuntuuitoolkit.CheckBox,
+            objectName='callWaitingSwitch')
+
+    def enable_call_waiting(self):
+        self._switch.check()
+
+    def disable_call_waiting(self):
+        self._switch.uncheck()
+
+
+class CallForwarding(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    """Autopilot helper for the Call forwarding page."""
+
+    @property
+    def _switch(self):
+        return self.wait_select_single(
+            ubuntuuitoolkit.CheckBox,
+            objectName='callForwardingSwitch')
+
+    @property
+    def _number_field(self):
+        return self.wait_select_single(
+            objectName='destNumberField')
+
+    def _click_set(self):
+        button = self.wait_select_single(
+            objectName='set')
+        self.pointing_device.click_object(button)
+
+    def _click_cancel(self):
+        button = self.wait_select_single(
+            objectName='cancel')
+        self.pointing_device.click_object(button)
+
+    @property
+    def current_forwarding(self):
+        return self.wait_select_single(
+            objectName='destNumberField').text
+
+    def enable_call_forwarding(self):
+        self._switch.check()
+
+    def disable_call_forwarding(self):
+        self._switch.uncheck()
+
+    def set_forward(self, number):
+        input_method = Keyboard.create()
+        self.enable_call_forwarding()
+        self.pointing_device.click_object(self._number_field)
+        input_method.type(number)
+        self._click_set()
+
+
+class Services(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    """Autopilot helper for the Call waiting page."""
+
+    # TODO: add pages for each relevant sim services page
+    def open_sim_service(self, service):
+        """Return a sim service page"""
+        pass
+
+
 class ResetPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
     """Autopilot helper for the Reset page."""

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-08-19 15:26:07 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-08-26 21:07:36 +0000
@@ -34,6 +34,8 @@
 RDO_IFACE = 'org.ofono.RadioSettings'
 SIM_IFACE = 'org.ofono.SimManager'
 NETREG_IFACE = 'org.ofono.NetworkRegistration'
+CALL_FWD_IFACE = 'org.ofono.CallForwarding'
+CALL_SETTINGS_IFACE = 'org.ofono.CallSettings'
 SYSTEM_IFACE = 'com.canonical.SystemImage'
 SYSTEM_SERVICE_OBJ = '/Service'
 
@@ -125,7 +127,7 @@
                'for m in objects if "%s/operator/" in m]' % name
 
     def mock_connection_manager(self, modem):
-        modem.AddProperty(CONNMAN_IFACE, 'Powered', True)
+        modem.AddProperty(CONNMAN_IFACE, 'Powered', dbus.Boolean(1))
         modem.AddProperty(CONNMAN_IFACE, 'RoamingAllowed', False)
         modem.AddMethods(
             CONNMAN_IFACE,
@@ -194,6 +196,7 @@
                 'SubscriberNumbers': ['123456', '234567']
             }
         modem.AddProperties(SIM_IFACE, properties)
+        modem.AddProperty(SIM_IFACE, 'Present', True)
         modem.AddMethods(
             SIM_IFACE,
             [('GetProperties', '', 'a{sv}',
@@ -204,18 +207,42 @@
                  "PropertyChanged", "sv", [args[0], args[1]])'
                     .replace('IFACE', SIM_IFACE)), ])
 
+    def mock_call_forwarding(self, modem):
+        modem.AddProperty(
+            CALL_FWD_IFACE, 'VoiceUnconditional', '')
+        modem.AddMethods(
+            CALL_FWD_IFACE,
+            [('GetProperties', '', 'a{sv}',
+              'ret = self.GetAll("%s")' % CALL_FWD_IFACE),
+                ('SetProperty', 'sv', '',
+                 'self.Set("IFACE", args[0], args[1]); '
+                 'self.EmitSignal("IFACE",\
+                 "PropertyChanged", "sv", [args[0], args[1]])'
+                    .replace('IFACE', CALL_FWD_IFACE)), ])
+
+    def mock_call_settings(self, modem):
+        modem.AddProperty(
+            CALL_SETTINGS_IFACE, 'VoiceCallWaiting', 'disabled')
+        modem.AddMethods(
+            CALL_SETTINGS_IFACE,
+            [('GetProperties', '', 'a{sv}',
+              'ret = self.GetAll("%s")' % CALL_SETTINGS_IFACE),
+                ('SetProperty', 'sv', '',
+                 'self.Set("IFACE", args[0], args[1]); '
+                 'self.EmitSignal("IFACE",\
+                 "PropertyChanged", "sv", [args[0], args[1]])'
+                    .replace('IFACE', CALL_SETTINGS_IFACE)), ])
+
     def add_sim1(self):
         # create modem_0 proxy
         self.modem_0 = self.dbus_con.get_object('org.ofono', '/ril_0')
 
-        # Add an available carrier
         self.mock_carriers('ril_0')
-
         self.mock_radio_settings(self.modem_0)
-
         self.mock_connection_manager(self.modem_0)
-
         self.mock_sim_manager(self.modem_0)
+        self.mock_call_forwarding(self.modem_0)
+        self.mock_call_settings(self.modem_0)
 
         self.modem_0.AddMethods('org.ofono.NetworkRegistration', [
             ('GetProperties', '', 'a{sv}',
@@ -232,6 +259,7 @@
         self.dbusmock.AddModem(second_modem, {'Powered': True})
         self.modem_1 = self.dbus_con.get_object(
             'org.ofono', '/%s' % second_modem)
+
         self.modem_1.AddMethods(NETREG_IFACE, [
             ('GetProperties', '', 'a{sv}',
                 'ret = self.GetAll("org.ofono.NetworkRegistration")'),
@@ -244,6 +272,8 @@
         self.mock_carriers(second_modem)
         self.mock_radio_settings(self.modem_1)
         self.mock_connection_manager(self.modem_1)
+        self.mock_call_forwarding(self.modem_1)
+        self.mock_call_settings(self.modem_1)
 
         self.mock_sim_manager(self.modem_1, {
             'SubscriberNumbers': ['08123', '938762783']
@@ -253,9 +283,10 @@
     def setUpClass(cls):
         cls.start_system_bus()
         cls.dbus_con = cls.get_dbus(True)
+        template = os.path.join(os.path.dirname(__file__), 'ofono.py')
         # Add a mock Ofono environment so we get consistent results
         (cls.p_mock, cls.obj_ofono) = cls.spawn_server_template(
-            'ofono', stdout=subprocess.PIPE)
+            template, stdout=subprocess.PIPE)
         cls.dbusmock = dbus.Interface(cls.obj_ofono, dbusmock.MOCK_IFACE)
 
     def setUp(self, panel=None):
@@ -294,6 +325,13 @@
         super(CellularBaseTestCase, self).setUp('cellular')
 
 
+class PhoneOfonoBaseTestCase(UbuntuSystemSettingsOfonoTestCase):
+    def setUp(self):
+        """ Go to Phone page """
+        super(PhoneOfonoBaseTestCase, self).setUp()
+        self.phone_page = self.system_settings.main_view.go_to_phone_page()
+
+
 class AboutBaseTestCase(UbuntuSystemSettingsTestCase):
     def setUp(self):
         """Go to About page."""
@@ -638,3 +676,19 @@
         self.mock_server.terminate()
         self.mock_server.wait()
         super(ResetBaseTestCase, self).tearDown()
+
+
+class SecurityBaseTestCase(UbuntuSystemSettingsTestCase):
+    """ Base class for security and privacy settings tests"""
+
+    def setUp(self):
+        super(SecurityBaseTestCase, self).setUp('security-privacy')
+        """ Go to Security & Privacy page """
+        self.security_page = self.system_settings.main_view.select_single(
+            objectName='securityPrivacyPage'
+        )
+        self.assertThat(self.security_page.active,
+                        Eventually(Equals(True)))
+
+    def tearDown(self):
+        super(SecurityBaseTestCase, self).tearDown()

=== added file 'tests/autopilot/ubuntu_system_settings/tests/ofono.py'
--- tests/autopilot/ubuntu_system_settings/tests/ofono.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/ofono.py	2014-08-26 21:07:36 +0000
@@ -0,0 +1,215 @@
+'''ofonod D-BUS mock template'''
+
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option) any
+# later version.  See http://www.gnu.org/copyleft/lgpl.html for the full text
+# of the license.
+
+__author__ = 'Martin Pitt'
+__email__ = '[e-mail]'
+__copyright__ = '(c) 2013 Canonical Ltd.'
+__license__ = 'LGPL 3+'
+
+
+import dbus
+
+import dbusmock
+
+BUS_NAME = 'org.ofono'
+MAIN_OBJ = '/'
+MAIN_IFACE = 'org.ofono.Manager'
+SYSTEM_BUS = True
+
+NOT_IMPLEMENTED = '''raise dbus.exceptions.DBusException(
+    "org.ofono.Error.NotImplemented")'''
+
+_parameters = {}
+
+
+def load(mock, parameters):
+    global _parameters
+    mock.modems = []  # object paths
+    _parameters = parameters
+    mock.AddMethod(MAIN_IFACE, 'GetModems', '', 'a(oa{sv})',
+                   'ret = [(m, objects[m].GetAll(\
+                        "org.ofono.Modem")) for m in self.modems]')
+
+    if not parameters.get('no_modem', False):
+        mock.AddModem(parameters.get('ModemName', 'ril_0'), {})
+
+
[e-mail](dbusmock.MOCK_IFACE,
+                     in_signature='sa{sv}', out_signature='s')
+def AddModem(self, name, properties):
+    '''Convenience method to add a modem
+
+    You have to specify a device name which must be a valid part of an object
+    path, e. g. "mock_ac". For future extensions you can specify a "properties"
+    array, but no extra properties are supported for now.
+
+    Returns the new object path.
+    '''
+    path = '/' + name
+    self.AddObject(
+        path,
+        'org.ofono.Modem',
+        {
+            'Online': dbus.Boolean(True, variant_level=1),
+            'Powered': dbus.Boolean(True, variant_level=1),
+            'Lockdown': dbus.Boolean(False, variant_level=1),
+            'Emergency': dbus.Boolean(False, variant_level=1),
+            'Manufacturer': dbus.String('Fakesys', variant_level=1),
+            'Model': dbus.String('Mock Modem', variant_level=1),
+            'Revision': dbus.String('0815.42', variant_level=1),
+            'Type': dbus.String('hardware', variant_level=1),
+            'Interfaces': [
+                'org.ofono.CallVolume',
+                'org.ofono.VoiceCallManager',
+                'org.ofono.NetworkRegistration',
+                'org.ofono.SimManager'],
+            'Features': ['gprs', 'net'],
+        },
+        [
+            ('GetProperties', '', 'a{sv}',
+                'ret = self.GetAll("org.ofono.Modem")'),
+            (
+                'SetProperty', 'sv', '',
+                'self.Set("org.ofono.Modem", args[0], args[1]); '
+                'self.EmitSignal("org.ofono.Modem", "PropertyChanged",'
+                '"sv", [args[0], args[1]])'),
+        ])
+    obj = dbusmock.mockobject.objects[path]
+    obj.name = name
+    add_voice_call_api(obj)
+    add_netreg_api(obj)
+    self.modems.append(path)
+    props = obj.GetAll('org.ofono.Modem', dbus_interface=dbus.PROPERTIES_IFACE)
+    self.EmitSignal(MAIN_IFACE, 'ModemAdded', 'oa{sv}', [path, props])
+    return path
+
+
+def add_voice_call_api(mock):
+    '''Add org.ofono.VoiceCallManager API to a mock'''
+
+    # also add an emergency number which is not a real one, in case one runs a
+    # test case against a production ofono :-)
+    mock.AddProperty(
+        'org.ofono.VoiceCallManager', 'EmergencyNumbers', ['911', '13373'])
+
+    mock.calls = []  # object paths
+
+    mock.AddMethods('org.ofono.VoiceCallManager', [
+        (
+            'GetProperties', '', 'a{sv}',
+            'ret = self.GetAll("org.ofono.VoiceCallManager")'),
+        ('Transfer', '', '', ''),
+        ('SwapCalls', '', '', ''),
+        ('ReleaseAndAnswer', '', '', ''),
+        ('ReleaseAndSwap', '', '', ''),
+        ('HoldAndAnswer', '', '', ''),
+        ('SendTones', 's', '', ''),
+        ('PrivateChat', 'o', 'ao', NOT_IMPLEMENTED),
+        ('CreateMultiparty', '', 'o', NOT_IMPLEMENTED),
+        ('HangupMultiparty', '', '', NOT_IMPLEMENTED),
+        (
+            'GetCalls', '', 'a(oa{sv})',
+            'ret = [(c, objects[c].GetAll("org.ofono.VoiceCall"))\
+             for c in self.calls]')
+    ])
+
+
[e-mail]('org.ofono.VoiceCallManager',
+                     in_signature='ss', out_signature='s')
+def Dial(self, number, hide_callerid):
+    path = self._object_path + '/voicecall%02i' % (len(self.calls) + 1)
+    self.AddObject(
+        path, 'org.ofono.VoiceCall',
+        {
+            'State': dbus.String('dialing', variant_level=1),
+            'LineIdentification': dbus.String(number, variant_level=1),
+            'Name': dbus.String('', variant_level=1),
+            'Multiparty': dbus.Boolean(False, variant_level=1),
+            'Multiparty': dbus.Boolean(False, variant_level=1),
+            'RemoteHeld': dbus.Boolean(False, variant_level=1),
+            'RemoteMultiparty': dbus.Boolean(False, variant_level=1),
+            'Emergency': dbus.Boolean(False, variant_level=1),
+        },
+        [
+            (
+                'GetProperties', '', 'a{sv}',
+                'ret = self.GetAll("org.ofono.VoiceCall")'),
+            ('Deflect', 's', '', NOT_IMPLEMENTED),
+            (
+                'Hangup', '', '',
+                'self.parent.calls.remove(self._object_path);'
+                'self.parent.RemoveObject(self._object_path);'
+                'self.EmitSignal("org.ofono.VoiceCallManager",\
+                     "CallRemoved", "o", [self._object_path])'),
+            ('Answer', '', '', NOT_IMPLEMENTED),
+        ])
+    obj = dbusmock.mockobject.objects[path]
+    obj.parent = self
+    self.calls.append(path)
+    self.EmitSignal('org.ofono.VoiceCallManager', 'CallAdded', 'oa{sv}',
+                    [path, obj.GetProperties()])
+    return path
+
+
[e-mail]('org.ofono.VoiceCallManager',
+                     in_signature='', out_signature='')
+def HangupAll(self):
+    print('XXX HangupAll', self.calls)
+    for c in list(self.calls):  # needs a copy
+        dbusmock.mockobject.objects[c].Hangup()
+    assert self.calls == []
+
+
+def get_all_operators(mock):
+    return 'ret = [(m, objects[m].GetAll("org.ofono.NetworkOperator")) ' \
+           'for m in objects if "%s/operator/" in m]' % mock.name
+
+
+def add_netreg_api(mock):
+    '''Add org.ofono.NetworkRegistration API to a mock'''
+
+    # also add an emergency number which is not a real one, in case one runs a
+    # test case against a production ofono :-)
+    mock.AddProperties('org.ofono.NetworkRegistration', {
+        'Mode': 'auto',
+        'Status': 'registered',
+        'LocationAreaCode': _parameters.get('LocationAreaCode', 987),
+        'CellId': _parameters.get('CellId', 10203),
+        'MobileCountryCode': _parameters.get('MobileCountryCode', '777'),
+        'MobileNetworkCode': _parameters.get('MobileNetworkCode', '11'),
+        'Technology': _parameters.get('Technology', 'gsm'),
+        'Name': _parameters.get('Name', 'fake.tel'),
+        'Strength': _parameters.get('Strength', dbus.Byte(80)),
+        'BaseStation': _parameters.get('BaseStation', ''),
+    })
+
+    mock.AddObject(
+        '/%s/operator/op1' % mock.name,
+        'org.ofono.NetworkOperator',
+        {
+            'Name': _parameters.get('Name', 'fake.tel'),
+            'Status': 'current',
+            'MobileCountryCode': _parameters.get('MobileCountryCode', '777'),
+            'MobileNetworkCode': _parameters.get('MobileNetworkCode', '11'),
+            'Technologies': [_parameters.get('Technology', 'gsm')],
+        },
+        [
+            (
+                'GetProperties', '', 'a{sv}',
+                'ret = self.GetAll("org.ofono.NetworkOperator")'),
+            ('Register', '', '', ''),
+        ])
+
+    mock.AddMethods('org.ofono.NetworkRegistration', [
+        (
+            'GetProperties', '', 'a{sv}',
+            'ret = self.GetAll("org.ofono.NetworkRegistration")'),
+        ('Register', '', '', ''),
+        ('GetOperators', '', 'a(oa{sv})', get_all_operators(mock)),
+        ('Scan', '', 'a(oa{sv})', get_all_operators(mock)),
+    ])

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_cellular.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-08-14 14:18:17 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-08-26 21:07:36 +0000
@@ -15,7 +15,7 @@
 from unittest import skip
 
 from ubuntu_system_settings.tests import (
-    CellularBaseTestCase, CONNMAN_IFACE, RDO_IFACE)
+    CellularBaseTestCase, CONNMAN_IFACE, RDO_IFACE, SIM_IFACE)
 from ubuntu_system_settings.utils.i18n import ugettext as _
 
 from ubuntuuitoolkit import emulators as toolkit_emulators
@@ -92,6 +92,14 @@
             Equals(_('Cellular'))
         )
 
+    def test_single_sim_layout(self):
+        self.system_settings.main_view.cellular_page.\
+            select_single(objectName="singleSim")
+        self.assertThat(lambda: self.system_settings.main_view.select_single(
+            objectName='multiSim'), raises(StateNotFoundError))
+        self.assertThat(lambda: self.system_settings.main_view.select_single(
+            objectName='noSim'), raises(StateNotFoundError))
+
     def test_current_network(self):
         """ Tests whether the current network is visible and selected """
         self.navigate_to_carrier_page()
@@ -592,3 +600,90 @@
         self.assertEqual(
             gsettings.get_value('default-sim-for-messages').get_string(),
             '/ril_1')
+
+    def test_multi_sim_layout(self):
+        self.system_settings.main_view.cellular_page.\
+            select_single(objectName="multiSim")
+        self.assertThat(lambda: self.system_settings.main_view.select_single(
+            objectName='singleSim'), raises(StateNotFoundError))
+        self.assertThat(lambda: self.system_settings.main_view.select_single(
+            objectName='noSim'), raises(StateNotFoundError))
+
+    def test_remove_one_sim(self):
+        self.modem_0.EmitSignal(
+            SIM_IFACE,
+            'PropertyChanged',
+            'sv',
+            ['Present', 'False'])
+
+        self.system_settings.main_view.cellular_page.\
+            select_single(objectName="singleSim")
+        self.assertThat(lambda: self.system_settings.main_view.select_single(
+            objectName='multiSim'), raises(StateNotFoundError))
+        self.assertThat(lambda: self.system_settings.main_view.select_single(
+            objectName='noSim'), raises(StateNotFoundError))
+
+    def test_remove_two_sims(self):
+        self.modem_0.EmitSignal(
+            SIM_IFACE,
+            'PropertyChanged',
+            'sv',
+            ['Present', 'False'])
+
+        self.modem_1.EmitSignal(
+            SIM_IFACE,
+            'PropertyChanged',
+            'sv',
+            ['Present', 'False'])
+
+        self.system_settings.main_view.cellular_page.\
+            wait_select_single(objectName="noSim")
+        self.assertThat(
+            lambda: self.system_settings.main_view.select_single(
+                objectName='multiSim'), raises(StateNotFoundError))
+        self.assertThat(
+            lambda: self.system_settings.main_view.select_single(
+                objectName='singleSim'), raises(StateNotFoundError))
+
+    def test_remove_and_insert_sims(self):
+        self.modem_0.EmitSignal(
+            SIM_IFACE,
+            'PropertyChanged',
+            'sv',
+            ['Present', 'False'])
+
+        self.modem_1.EmitSignal(
+            SIM_IFACE,
+            'PropertyChanged',
+            'sv',
+            ['Present', 'False'])
+
+        self.system_settings.main_view.cellular_page.\
+            wait_select_single(objectName="noSim")
+        self.assertThat(
+            lambda: self.system_settings.main_view.select_single(
+                objectName='multiSim'), raises(StateNotFoundError))
+        self.assertThat(
+            lambda: self.system_settings.main_view.select_single(
+                objectName='singleSim'), raises(StateNotFoundError))
+
+        self.modem_0.EmitSignal(
+            SIM_IFACE,
+            'PropertyChanged',
+            'sv',
+            ['Present', 'True'])
+
+        self.modem_1.EmitSignal(
+            SIM_IFACE,
+            'PropertyChanged',
+            'sv',
+            ['Present', 'True'])
+
+        self.system_settings.main_view.cellular_page.\
+            wait_select_single(objectName="multiSim")
+        self.assertThat(
+            lambda: self.system_settings.main_view.select_single(
+                objectName='noSim'), raises(StateNotFoundError))
+        self.assertThat(
+            lambda: self.system_settings.main_view.select_single(
+                objectName='singleSim'), raises(StateNotFoundError))

=== added file 'tests/autopilot/ubuntu_system_settings/tests/test_phone.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_phone.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_phone.py	2014-08-26 21:07:36 +0000
@@ -0,0 +1,111 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2014 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+
+from __future__ import absolute_import
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Contains, Equals
+
+from ubuntu_system_settings.tests import (
+    PhoneOfonoBaseTestCase, CALL_FWD_IFACE, CALL_SETTINGS_IFACE)
+
+
+class PhoneTestCase(PhoneOfonoBaseTestCase):
+    """Tests for Phone Page"""
+
+    def test_call_fwd(self):
+        call_fwd_page = self.phone_page.go_to_call_forwarding()
+        call_fwd_page.set_forward("41444424")
+
+        # Check that the forward has been set
+        self.assertThat(
+            call_fwd_page.current_forwarding,
+            Eventually(Equals('41444424')))
+
+        # Check that dbus properties have been updated
+        self.assertThat(
+            lambda: str(self.modem_0.Get(CALL_FWD_IFACE,
+                                         'VoiceUnconditional')),
+            Eventually(Contains('41444424')))
+
+    def test_call_waiting(self):
+        call_wait = self.phone_page.go_to_call_waiting()
+        # we have to help our test here, this normally takes quite a while
+        self.modem_0.EmitSignal(
+            CALL_SETTINGS_IFACE, 'PropertyChanged', 'sv',
+            ['VoiceCallWaiting', 'disabled'])
+        call_wait.enable_call_waiting()
+
+        # Check that dbus properties have been updated
+        self.assertThat(
+            lambda: str(self.modem_0.Get(CALL_SETTINGS_IFACE,
+                                         'VoiceCallWaiting')),
+            Eventually(Contains('enabled')))
+
+
+class PhoneDualSimTestCase(PhoneOfonoBaseTestCase):
+    """Tests for Phone Page"""
+
+    use_sims = 2
+
+    def test_call_fwd_sim_1(self):
+        call_fwd_page = self.phone_page.go_to_call_forwarding(sim=1)
+        call_fwd_page.set_forward("41444424")
+
+        # Check that the forward has been set
+        self.assertThat(
+            call_fwd_page.current_forwarding,
+            Eventually(Equals('41444424')))
+
+        # Check that dbus properties have been updated
+        self.assertThat(
+            lambda: str(self.modem_0.Get(CALL_FWD_IFACE,
+                                         'VoiceUnconditional')),
+            Eventually(Contains('41444424')))
+
+    def test_call_fwd_sim_2(self):
+        call_fwd_page = self.phone_page.go_to_call_forwarding(sim=2)
+        call_fwd_page.set_forward("41444424")
+
+        # Check that the forward has been set
+        self.assertThat(
+            call_fwd_page.current_forwarding,
+            Eventually(Equals('41444424')))
+
+        # Check that dbus properties have been updated
+        self.assertThat(
+            lambda: str(self.modem_1.Get(CALL_FWD_IFACE,
+                                         'VoiceUnconditional')),
+            Eventually(Contains('41444424')))
+
+    def test_call_waiting_sim_1(self):
+        call_wait = self.phone_page.go_to_call_waiting(sim=1)
+        # we have to help our test here, this normally takes quite a while
+        self.modem_0.EmitSignal(
+            CALL_SETTINGS_IFACE, 'PropertyChanged', 'sv',
+            ['VoiceCallWaiting', 'disabled'])
+        call_wait.enable_call_waiting()
+
+        # Check that dbus properties have been updated
+        self.assertThat(
+            lambda: str(self.modem_0.Get(CALL_SETTINGS_IFACE,
+                                         'VoiceCallWaiting')),
+            Eventually(Contains('enabled')))
+
+    def test_call_waiting_sim_2(self):
+        call_wait = self.phone_page.go_to_call_waiting(sim=2)
+        # we have to help our test here, this normally takes quite a while
+        self.modem_1.EmitSignal(
+            CALL_SETTINGS_IFACE, 'PropertyChanged', 'sv',
+            ['VoiceCallWaiting', 'disabled'])
+        call_wait.enable_call_waiting()
+
+        # Check that dbus properties have been updated
+        self.assertThat(
+            lambda: str(self.modem_1.Get(CALL_SETTINGS_IFACE,
+                                         'VoiceCallWaiting')),
+            Eventually(Contains('enabled')))

=== added file 'tests/autopilot/ubuntu_system_settings/tests/test_security.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_security.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_security.py	2014-08-26 21:07:36 +0000
@@ -0,0 +1,173 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2014 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+
+from gi.repository import Gio
+from time import sleep
+from testtools.matchers import Equals, NotEquals
+from autopilot.matchers import Eventually
+
+from ubuntu_system_settings.tests import SecurityBaseTestCase
+
+from ubuntu_system_settings.utils.i18n import ugettext as _
+from ubuntuuitoolkit import emulators as toolkit_emulators
+
+
+class SecurityTestCase(SecurityBaseTestCase):
+    """ Tests for Security Page """
+
+    def setUp(self):
+        super(SecurityTestCase, self).setUp()
+        prps = self.system_settings.main_view.security_page.get_properties()
+        self.use_powerd = prps['usePowerd']
+        if self.use_powerd:
+            gsettings = Gio.Settings.new('com.ubuntu.touch.system')
+            prev = gsettings.get_uint('activity-timeout')
+            self.addCleanup(
+                self.set_prev_activity_timeout, gsettings, prev)
+        else:
+            gsettings = Gio.Settings.new('org.gnome.desktop.session')
+            prev = gsettings.get_uint('idle-delay')
+            self.addCleanup(
+                self.set_prev_idle_delay, gsettings, prev)
+
+    def set_prev_idle_delay(self, gsettings, prev):
+        gsettings.set_uint('idle-delay', prev)
+        self.assertThat(
+            lambda: int(gsettings.get_uint('idle-delay')),
+            Eventually(Equals(prev))
+        )
+
+    def set_prev_activity_timeout(self, gsettings, prev):
+        gsettings.set_uint('activity-timeout', prev)
+        self.assertThat(
+            lambda: int(gsettings.get_uint('activity-timeout')),
+            Eventually(Equals(prev))
+        )
+
+    def _get_activity_timeout(self):
+        if self.use_powerd:
+            gsettings = Gio.Settings.new('com.ubuntu.touch.system')
+            prev = gsettings.get_uint('activity-timeout')
+            return prev
+        else:
+            gsettings = Gio.Settings.new('org.gnome.desktop.session')
+            prev = gsettings.get_uint('idle-delay')
+            return prev
+
+    def _go_to_phone_lock(self):
+        selector = self.security_page.select_single(
+            objectName="lockingControl"
+        )
+        self.system_settings.main_view.scroll_to_and_click(selector)
+
+    def _go_to_sleep_values(self):
+        self._go_to_phone_lock()
+        selector = self.system_settings.main_view.select_single(
+            objectName="lockTimeout"
+        )
+        self.system_settings.main_view.scroll_to_and_click(selector)
+
+    def _get_sleep_selector(self):
+        self._go_to_sleep_values()
+        sleep_values_page = self.system_settings.main_view.select_single(
+            objectName='sleepValues')
+        self.assertThat(
+            sleep_values_page,
+            NotEquals(None)
+        )
+        self._go_to_sleep_values()
+        sleep_values_page = self.system_settings.main_view.select_single(
+            objectName='sleepValues')
+        return sleep_values_page.select_single(
+            toolkit_emulators.ItemSelector,
+            objectName="sleepSelector"
+        )
+
+    def test_security_page(self):
+        """ Checks whether Security page is available """
+        self.assertThat(
+            self.system_settings.main_view.security_page,
+            NotEquals(None)
+        )
+        self.assertThat(
+            self.system_settings.main_view.security_page.title,
+            Equals(_('Security & Privacy'))
+        )
+
+    def test_locking_control_value(self):
+        actTimeout = self._get_activity_timeout()
+        activityTimeout = self.security_page.select_single(
+            objectName='lockingControl').value
+        if actTimeout is 0:
+            self.assertEquals(activityTimeout, ('Manually'))
+        elif actTimeout is 60:
+            self.assertEquals(
+                activityTimeout,
+                ('After {:d} minute').format(int(actTimeout/60)))
+        else:
+            self.assertEquals(
+                activityTimeout,
+                ('After {:d} minutes').format(int(actTimeout/60)))
+
+    def test_phone_lock_page(self):
+        self._go_to_phone_lock()
+        phone_lock_page = self.system_settings.main_view.select_single(
+            objectName='phoneLockingPage')
+        self.assertThat(
+            phone_lock_page,
+            NotEquals(None)
+        )
+        self.assertThat(
+            phone_lock_page.title,
+            Equals(_('Phone locking'))
+        )
+
+    def test_phone_lock_value(self):
+        self._go_to_phone_lock()
+        phone_lock_page = self.system_settings.main_view.select_single(
+            objectName='phoneLockingPage')
+        actTimeout = self._get_activity_timeout()
+        activityTimeout = phone_lock_page.select_single(
+            objectName='lockTimeout').value
+        if actTimeout is 0:
+            self.assertEquals(activityTimeout, ('Never'))
+        elif actTimeout is 60:
+            self.assertEquals(
+                activityTimeout,
+                ('{:d} minute').format(int(actTimeout/60))
+            )
+        else:
+            self.assertEquals(
+                activityTimeout,
+                ('{:d} minutes').format(int(actTimeout/60))
+            )
+
+    def test_idle_never_timeout(self):
+        selector = self._get_sleep_selector()
+        to_select = selector.select_single(
+            'OptionSelectorDelegate', text='Never')
+        self.system_settings.main_view.pointing_device.click_object(to_select)
+        to_select.selected.wait_for(True)
+        sleep(1)
+        actTimeout = self._get_activity_timeout()
+        self.assertEquals(actTimeout, 0)
+        selected_delegate = selector.select_single(
+            'OptionSelectorDelegate', selected=True)
+        self.assertEquals(selected_delegate.text, 'Never')
+
+    def test_idle_change_timeout(self):
+        selector = self._get_sleep_selector()
+        to_select = selector.select_single(
+            'OptionSelectorDelegate', text='After 4 minutes')
+        self.system_settings.main_view.pointing_device.click_object(to_select)
+        to_select.selected.wait_for(True)
+        sleep(1)
+        actTimeout = self._get_activity_timeout()
+        self.assertEquals(actTimeout, 240)
+        selected_delegate = selector.select_single(
+            'OptionSelectorDelegate', selected=True)
+        self.assertEquals(selected_delegate.text, 'After 4 minutes')

=== modified file 'tests/plugins/bluetooth/tst_bluetooth.cpp'
--- tests/plugins/bluetooth/tst_bluetooth.cpp	2014-07-25 04:02:13 +0000
+++ tests/plugins/bluetooth/tst_bluetooth.cpp	2014-08-26 21:07:36 +0000
@@ -168,5 +168,5 @@
     QCOMPARE(m_bluetooth->isDiscovering(), true);
 }
 
-QTEST_MAIN(BluetoothTest);
+QTEST_MAIN(BluetoothTest)
 #include "tst_bluetooth.moc"

=== modified file 'tests/plugins/bluetooth/tst_devicemodel.cpp'
--- tests/plugins/bluetooth/tst_devicemodel.cpp	2014-07-25 04:02:13 +0000
+++ tests/plugins/bluetooth/tst_devicemodel.cpp	2014-08-26 21:07:36 +0000
@@ -93,5 +93,5 @@
     QVERIFY(!device->getPath().isEmpty());
 }
 
-QTEST_MAIN(DeviceModelTest);
+QTEST_MAIN(DeviceModelTest)
 #include "tst_devicemodel.moc"

=== modified file 'tests/plugins/system-update/tst_update.cpp'
--- tests/plugins/system-update/tst_update.cpp	2014-01-24 11:55:50 +0000
+++ tests/plugins/system-update/tst_update.cpp	2014-08-26 21:07:36 +0000
@@ -51,5 +51,5 @@
     QCOMPARE(app.updateRequired(), true);
 }
 
-QTEST_MAIN(UpdateTest);
+QTEST_MAIN(UpdateTest)
 #include "tst_update.moc"

=== modified file 'tests/plugins/system-update/tst_updatemanager.cpp'
--- tests/plugins/system-update/tst_updatemanager.cpp	2014-05-05 18:18:37 +0000
+++ tests/plugins/system-update/tst_updatemanager.cpp	2014-08-26 21:07:36 +0000
@@ -151,5 +151,5 @@
 }
 
 
-QTEST_MAIN(UpdateManagerTest);
+QTEST_MAIN(UpdateManagerTest)
 #include "tst_updatemanager.moc"

=== modified file 'tests/test-plugin2.cpp'
--- tests/test-plugin2.cpp	2014-02-28 17:14:49 +0000
+++ tests/test-plugin2.cpp	2014-08-26 21:07:36 +0000
@@ -29,8 +29,8 @@
 {
 }
 
-ItemBase *TestPlugin2::createItem(const QVariantMap &staticData,
-                                  QObject *parent)
+ItemBase *TestPlugin2::createItem(const QVariantMap &/*staticData*/,
+                                  QObject */*parent*/)
 {
     return NULL;
 }

=== modified file 'tests/tst_arguments.cpp'
--- tests/tst_arguments.cpp	2013-09-30 09:29:34 +0000
+++ tests/tst_arguments.cpp	2014-08-26 21:07:36 +0000
@@ -108,5 +108,5 @@
     QCOMPARE(pluginOptions, expectedOptions);
 }
 
-QTEST_MAIN(ArgumentsTest);
+QTEST_MAIN(ArgumentsTest)
 #include "tst_arguments.moc"

=== modified file 'tests/tst_plugins.cpp'
--- tests/tst_plugins.cpp	2014-02-28 17:14:49 +0000
+++ tests/tst_plugins.cpp	2014-08-26 21:07:36 +0000
@@ -163,5 +163,5 @@
     phone->reset();
 }
 
-QTEST_MAIN(PluginsTest);
+QTEST_MAIN(PluginsTest)
 #include "tst_plugins.moc"

=== added file 'wizard/qml/Components/CheckableSetting.qml'
--- wizard/qml/Components/CheckableSetting.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Components/CheckableSetting.qml	2014-08-26 21:07:36 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import QMenuModel 0.1
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+ListItem.Empty {
+    id: listItem
+
+    property alias text: label.text
+    property bool checked: false
+    property real leftMargin
+    property real rightMargin
+
+    signal linkActivated(string link)
+
+    implicitHeight: label.height + units.gu(2)
+
+    Item {
+        anchors.fill: parent
+
+        CheckBox {
+            id: checkBox
+
+            anchors {
+                left: parent.left
+                verticalCenter: parent.verticalCenter
+                leftMargin: listItem.leftMargin
+            }
+
+            Component.onCompleted: {
+                checked = listItem.checked;
+            }
+
+            onClicked: {
+                listItem.checked = checked
+                listItem.triggered(listItem.checked)
+            }
+
+            Connections {
+                target: listItem
+                onCheckedChanged: checkBox.checked = listItem.checked
+            }
+
+            Connections {
+                target: listItem.__mouseArea
+                onClicked: listItem.checked = !listItem.checked
+            }
+        }
+
+        Label {
+            id: label
+            anchors {
+                left: checkBox.right
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+                leftMargin: units.gu(2)
+                rightMargin: listItem.rightMargin
+            }
+            wrapMode: Text.Wrap
+            linkColor: Theme.palette.normal.foregroundText
+            onLinkActivated: listItem.linkActivated(link)
+        }
+    }
+}