Merge lp:~nick-dedekind/ubuntu-system-settings/lp1336715.check.sync into lp:ubuntu-system-settings/rtm-14.09

[kevin gunn]

Fixed switches & check-boxes going out of sync with backends.

Fixed switches & check-boxes going out of sync with backends.

[Ken VanDine (ken-vandine)]

Please create a new branch based on lp:ubuntu-system-settings/rtm-14.09 and merge just the commits from trunk into your new branch. Then propose that branch.

For example:

bzr branch lp:ubuntu-system-settings/rtm-14.09
cd rtm-14.09
bzr merge lp:ubuntu-system-settings -r 1187..1189

However that will still conflict slightly, you'll need to manually merge 2 files because they have diverged too much between trunk and rtm at this point.

review: Needs Fixing

[Sebastien Bacher (seb128)]

is that superseeded by https://code.launchpad.net/~ken-vandine/ubuntu-system-settings/rtm-lp1336715.check.sync/+merge/241360 ?

Unmerged revisions

1160. By Nick Dedekind on 2014-11-04

more fixes

1159. By Nick Dedekind on 2014-11-04

merged with trunk

1158. By Nick Dedekind on 2014-11-04

reverted unnecessary changes

1157. By Nick Dedekind on 2014-11-04

dont use USC.SyncSwitch

1156. By Nick Dedekind on 2014-11-03

removed unnecessary change

1155. By Nick Dedekind on 2014-11-03

bump usc requirement

1154. By Nick Dedekind on 2014-10-23

fixed out of sync switches

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-04 14:38:52 +0000
+++ debian/changelog	2014-11-07 22:38:03 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ubuntu-system-settings (0.3+14.10.20141104~rtm-0ubuntu1) 14.09; urgency=low
 
   [ Ken VanDine ]
@@ -55,6 +56,118 @@
 
  -- Ubuntu daily release <[e-mail]>  Tue, 21 Oct 2014 15:24:55 +0000
 
+=======
+ubuntu-system-settings (0.3+15.04.20141103-0ubuntu1) vivid; urgency=low
+
+  [ Ken VanDine ]
+  * Use the SliderMenu component instead of the Slider component, it
+    matches the design and doesn't flicker while changing the
+    brightness. (LP: #1289465)
+  * Need to create UpClient regardless of upower version
+
+  [ Sebastien Bacher ]
+  * [storage] build the correct ini name rather than guessing it (LP:
+    #1387834)
+  * [battery] don't use a colored icon (LP: #1351383)
+
+  [ Michael Terry ]
+  * Redesign location page according to latest design visuals / text.
+    Allows GPS-only, GPS+HERE, or nothing at all. (LP: #1384763)
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 03 Nov 2014 17:30:03 +0000
+
+ubuntu-system-settings (0.3+15.04.20141031.2-0ubuntu1) vivid; urgency=low
+
+  [ Sebastien Bacher ]
+  * Tweaks to try to make the section headers and titles closer to the
+    design. Use a custom component, with tweaked margins and disabled
+    tap effects, for that.
+
+  [ Iain Lane ]
+  * Move formatSize into a new Utilities class in the qml context and
+    call this from the updates panel to consistently display sizes (LP:
+    #1385286)
+  * Update to work with UPower >= 0.99 as well as current versions (LP:
+    #1330037)
+
+  [ Albert Astals ]
+  * i18n++ (LP: #1386730)
+
+  [ William Hua ]
+  * Re-translate the UI when reboot is cancelled after language change.
+    (LP: #1377984)
+
+  [ jonas-drange ]
+  * [cellular] split "Cellular Data" and "Connection type" into two
+    separate pieces in the UI for both single and multi SIM (LP:
+    #1361226)
+  * [wifi] use actiongroup to hide "connect to other networks" (LP:
+    #1377076)
+
+  [ Michael Terry ]
+  * When the power button is held down, show the shutdown dialog like we
+    do in the unity8 shell. (LP: #1381731)
+  * Add a Continue button when choosing a passphrase. And fix a few
+    other design nits with choosing a password.
+
+  [ Michael Zanetti ]
+  * Drop reboot notification label on launcher reset. (LP: #1376707)
+
+  [ Mathieu Trudel-Lapierre ]
+  * [bluetooth] Show bluetooth address instead of name while it's not
+    detected; to be updated once available. (LP: #1382767)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 31 Oct 2014 14:53:52 +0000
+
+ubuntu-system-settings (0.3+15.04.20141028.1-0ubuntu1) vivid; urgency=low
+
+  [ Ken VanDine ]
+  * Refactored to use a singleton for UpdateManager shared in both QML
+    and CPP. Don't load the dynamic visibility items while creating the
+    item model, defer that to the loader. (LP: #1317007)
+
+  [ Florian Boucault ]
+  * Added QML debugging.
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 28 Oct 2014 20:44:34 +0000
+
+ubuntu-system-settings (0.3+15.04.20141028-0ubuntu1) vivid; urgency=low
+
+  [ Michael Terry ]
+  * Fix a typo in the HERE terms link.
+
+  [ CI bot ]
+  * Resync trunk
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 28 Oct 2014 14:15:45 +0000
+
+ubuntu-system-settings (0.3+14.10.20141022-0ubuntu1) utopic; urgency=low
+
+  [ CI bot ]
+  * Resync trunk
+
+  [ Michael Zanetti ]
+  * update code to reset launcher after launcher backend implementation
+    was reworked (LP: #1376707)
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 22 Oct 2014 21:34:27 +0000
+
+ubuntu-system-settings (0.3+14.10.20141021.1-0ubuntu1) utopic; urgency=low
+
+  [ Sebastien Bacher ]
+  * [storage] translator comment for the string "%1 free" (LP: #1377929)
+  * [system-update] ellipsize labels if needed (LP: #1376286)
+  * [sound] Use the correct low icon (LP: #1376286)
+
+  [ Lars Uebernickel ]
+  * notification-manager: fix issues with GVariant API usage
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 21 Oct 2014 15:24:55 +0000
+
+>>>>>>> MERGE-SOURCE
 ubuntu-system-settings (0.3+14.10.20141021-0ubuntu1) utopic; urgency=low
 
   [ jonas-drange ]
 
=== modified file 'plugins/about/PageComponent.qml'
--- plugins/about/PageComponent.qml	2014-10-07 14:07:02 +0000
+++ plugins/about/PageComponent.qml	2014-11-07 22:38:03 +0000
@@ -74,7 +74,7 @@
             anchors.left: parent.left
             anchors.right: parent.right
 
-            ListItem.Base {
+            ListItem.Empty {
                 height: ubuntuLabel.height + deviceLabel.height + units.gu(6)
 
                 Column {
@@ -95,6 +95,7 @@
                         text: deviceInfos.manufacturer() ? deviceInfos.manufacturer() + " " + deviceInfos.model() : backendInfos.vendorString
                     }
                 }
+                highlightWhenPressed: false
             }
 
             Loader {
@@ -141,13 +142,18 @@
                 id: storageItem
                 objectName: "storageItem"
                 text: i18n.tr("Storage")
+<<<<<<< TREE
                 /* TRANSLATORS: that's the free disk space, indicated in the most appropriate storage unit */
                 value: i18n.tr("%1 free").arg(backendInfos.formatSize(storageInfo.availableDiskSpace("/home")))
+=======
+                /* TRANSLATORS: that's the free disk space, indicated in the most appropriate storage unit */
+                value: i18n.tr("%1 free").arg(Utilities.formatSize(storageInfo.availableDiskSpace("/home")))
+>>>>>>> MERGE-SOURCE
                 progression: true
                 onClicked: pageStack.push(Qt.resolvedUrl("Storage.qml"))
             }
 
-            ListItem.Standard {
+            SettingsItemTitle {
                 objectName: "softwareItem"
                 text: i18n.tr("Software:")
             }
@@ -176,9 +182,10 @@
                     onClicked:
                         pageStack.push(pluginManager.getByName("system-update").pageComponent)
                 }
+                showDivider: false
             }
 
-            ListItem.Standard {
+            SettingsItemTitle {
                 objectName: "legalItem"
                 text: i18n.tr("Legal:")
             }
 
=== modified file 'plugins/about/Storage.qml'
--- plugins/about/Storage.qml	2014-09-26 08:35:34 +0000
+++ plugins/about/Storage.qml	2014-11-07 22:38:03 +0000
@@ -138,7 +138,7 @@
                 id: diskItem
                 objectName: "diskItem"
                 text: i18n.tr("Total storage")
-                value: backendInfo.formatSize(diskSpace)
+                value: Utilities.formatSize(diskSpace)
                 showDivider: false
             }
 
@@ -199,7 +199,7 @@
                     iconFrame: iconPath // no frame for invalid icons, since these aren't app icons
                     text: displayName
                     value: installedSize ?
-                               backendInfo.formatSize(installedSize) :
+                               Utilities.formatSize(installedSize) :
                                i18n.tr("N/A")
                 }
             }
 
=== modified file 'plugins/about/StorageItem.qml'
--- plugins/about/StorageItem.qml	2014-01-27 10:41:38 +0000
+++ plugins/about/StorageItem.qml	2014-11-07 22:38:03 +0000
@@ -25,7 +25,7 @@
         id: sizelabel
         objectName: "sizeLabel"
         anchors.right: parent.right
-        text: backendInfo.formatSize(value)
+        text: Utilities.formatSize(value)
         visible: ready
     }
     ActivityIndicator {
 
=== modified file 'plugins/about/click.cpp'
--- plugins/about/click.cpp	2014-09-25 13:11:09 +0000
+++ plugins/about/click.cpp	2014-11-07 22:38:03 +0000
@@ -45,7 +45,8 @@
  */
 void ClickModel::populateFromDesktopOrIniFile (Click *newClick,
                                                QVariantMap hooks,
-                                               QDir directory)
+                                               QDir directory,
+                                               QString name)
 {
     QVariantMap appHooks;
     GKeyFile *appinfo = g_key_file_new();
@@ -69,17 +70,13 @@
             {
                 keyGroup = "ScopeConfig";
                 keyName = "DisplayName";
-
-                QDir scopeDirectory(
-                            directory.absoluteFilePath(appHooks.value("scope", "").toString()));
-                scopeDirectory.setNameFilters(QStringList()<<"*.ini");
-
-                QStringList iniEntry(scopeDirectory.entryList());
-
-                if (iniEntry.isEmpty())
-                    goto out;
-
-                QFile desktopOrIniFile(scopeDirectory.absoluteFilePath(iniEntry[0]));
+                QString scope(appHooks.value("scope", "").toString());
+
+                QDir scopeDirectory(directory.absoluteFilePath(scope));
+
+                /* the config is 'name_scope.ini' */
+                QFile desktopOrIniFile(scopeDirectory.absoluteFilePath(
+                                           name + "_" + scope + ".ini"));
                 desktopOrIniFileName =
                         g_strdup(desktopOrIniFile.fileName().toLocal8Bit().constData());
                 if (!desktopOrIniFile.exists())
@@ -193,7 +190,8 @@
     if (hooks.isValid()) {
         QVariantMap allHooks(hooks.toMap());
         // The desktop or ini file contains an icon and the display name
-        populateFromDesktopOrIniFile(&newClick, allHooks, directory);
+        populateFromDesktopOrIniFile(&newClick, allHooks, directory,
+                                     manifest.value("name", "").toString());
    }
 
     newClick.installSize = manifest.value("installed-size",
 
=== modified file 'plugins/about/click.h'
--- plugins/about/click.h	2014-09-25 11:17:42 +0000
+++ plugins/about/click.h	2014-11-07 22:38:03 +0000
@@ -58,7 +58,8 @@
 private:
     void populateFromDesktopOrIniFile(Click *newClick,
                                       QVariantMap hooks,
-                                      QDir directory);
+                                      QDir directory,
+                                      QString name);
     Click buildClick(QVariantMap manifest);
     QList<Click> buildClickList();
 
 
=== modified file 'plugins/about/storageabout.cpp'
--- plugins/about/storageabout.cpp	2014-10-02 16:35:40 +0000
+++ plugins/about/storageabout.cpp	2014-11-07 22:38:03 +0000
@@ -290,17 +290,6 @@
     return m_homeSize;
 }
 
-QString StorageAbout::formatSize(quint64 size) const
-{
-    guint64 g_size = size;
-
-    gchar * formatted_size = g_format_size (g_size);
-    QString q_formatted_size = QString::fromLocal8Bit(formatted_size);
-    g_free (formatted_size);
-
-    return q_formatted_size;
-}
-
 void StorageAbout::populateSizes()
 {
     quint32 *running = new quint32(0);
 
=== modified file 'plugins/about/storageabout.h'
--- plugins/about/storageabout.h	2014-09-24 12:29:57 +0000
+++ plugins/about/storageabout.h	2014-11-07 22:38:03 +0000
@@ -109,7 +109,6 @@
     quint64 getAudioSize();
     quint64 getPicturesSize();
     quint64 getHomeSize();
-    Q_INVOKABLE QString formatSize (quint64 size) const;
     Q_INVOKABLE void populateSizes();
     Q_INVOKABLE QString getDevicePath (const QString mount_point);
     bool getDeveloperMode();
 
=== modified file 'plugins/battery/PageComponent.qml'
--- plugins/battery/PageComponent.qml	2014-08-29 09:11:11 +0000
+++ plugins/battery/PageComponent.qml	2014-11-07 22:38:03 +0000
@@ -288,7 +288,7 @@
                 showDivider: false
             }
 
-            ListItem.Standard {
+            SettingsItemTitle {
                 text: i18n.tr("Ways to reduce battery use:")
             }
 
@@ -333,17 +333,11 @@
                 text: i18n.tr("Wi-Fi")
                 control: Switch {
                     id: wifiSwitch
-                    checked: batteryBackend.wifiEnabled
-                    onClicked: batteryBackend.wifiEnabled = checked
+                    property bool serverChecked: batteryBackend.wifiEnabled
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: batteryBackend.wifiEnabled = checked
                 }
-                Component.onCompleted:
-                    clicked.connect(wifiSwitch.clicked)
-            }
-
-            Binding {
-                target: wifiSwitch
-                property: "checked"
-                value: batteryBackend.wifiEnabled
             }
 
             QDBusActionGroup {
@@ -365,17 +359,14 @@
                     active: bluetoothActionGroup.enabled.state != null
                     sourceComponent: Switch {
                         id: btSwitch
-                        // Cannot use onCheckedChanged as this triggers a loop
-                        onClicked: bluetoothActionGroup.enabled.activate()
-                        checked: bluetoothActionGroup.enabled.state
+                        property bool serverChecked: bluetoothActionGroup.enabled.state
+                        onServerCheckedChanged: checked = serverChecked
+                        Component.onCompleted: checked = serverChecked
+                        onTriggered: bluetoothActionGroup.enabled.activate()
                     }
-
-                    // ListItem forwards the 'clicked' signal to its control.
-                    // It needs to be forwarded again to the Loader's sourceComponent
-                    signal clicked
-                    onClicked: item.clicked()
                 }
                 visible: bluetoothActionGroup.visible
+                Component.onCompleted: clicked.connect(btSwitch.clicked)
             }
 
             QDBusActionGroup {
@@ -396,16 +387,14 @@
                     active: locationActionGroup.enabled.state != null
                     sourceComponent: Switch {
                         id: gpsSwitch
-                        onClicked: locationActionGroup.enabled.activate()
-                        checked: locationActionGroup.enabled.state
+                        property bool serverChecked: locationActionGroup.enabled.state
+                        onServerCheckedChanged: checked = serverChecked
+                        Component.onCompleted: checked = serverChecked
+                        onTriggered: locationActionGroup.enabled.activate()
                     }
-
-                    // ListItem forwards the 'clicked' signal to its control.
-                    // It needs to be forwarded again to the Loader's sourceComponent
-                    signal clicked
-                    onClicked: item.clicked()
                 }
                 visible: locationActionGroup.enabled.state !== undefined
+                Component.onCompleted: clicked.connect(gpsSwitch.clicked)
             }
 
             ListItem.Caption {
 
=== modified file 'plugins/battery/SleepValues.qml'
--- plugins/battery/SleepValues.qml	2014-08-26 01:54:11 +0000
+++ plugins/battery/SleepValues.qml	2014-11-07 22:38:03 +0000
@@ -71,10 +71,14 @@
             anchors.left: parent.left
             anchors.right: parent.right
 
+            SettingsItemTitle {
+                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:")
+            }
+
             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
                 }
@@ -111,6 +115,7 @@
                   else
                     powerSettings.idleDelay = (index == 6) ? 0 : idleValues[index]
                 }
+                highlightWhenPressed: false
             }
 
             ListItem.Caption {
 
=== modified file 'plugins/battery/battery.cpp'
--- plugins/battery/battery.cpp	2014-08-28 07:22:28 +0000
+++ plugins/battery/battery.cpp	2014-11-07 22:38:03 +0000
@@ -63,15 +63,19 @@
 
 void Battery::buildDeviceString() {
     UpClient *client;
-    gboolean returnIsOk;
     GPtrArray *devices;
     UpDeviceKind kind;
 
     client = up_client_new();
+
+#if !UP_CHECK_VERSION(0, 99, 0)
+    gboolean returnIsOk;
+
     returnIsOk = up_client_enumerate_devices_sync(client, nullptr, nullptr);
 
     if(!returnIsOk)
         return;
+#endif
 
     devices = up_client_get_devices(client);
 
 
=== modified file 'plugins/battery/plugin/battery-plugin.cpp'
--- plugins/battery/plugin/battery-plugin.cpp	2014-07-23 13:37:06 +0000
+++ plugins/battery/plugin/battery-plugin.cpp	2014-11-07 22:38:03 +0000
@@ -49,10 +49,13 @@
 {
     BatteryItem *item (static_cast<BatteryItem *> (user_data));
 
+#if !UP_CHECK_VERSION(0, 99, 0)
     gboolean ret = up_client_enumerate_devices_sync (client, nullptr, nullptr);
     if (!ret) {
         item->setVisibility (false);
-    } else {
+    } else
+#endif
+    {
         GPtrArray *devices = up_client_get_devices (client);
         item->setVisibility (devices->len > 0);
         g_ptr_array_unref (devices);
 
=== modified file 'plugins/bluetooth/PageComponent.qml'
--- plugins/bluetooth/PageComponent.qml	2014-09-23 19:32:29 +0000
+++ plugins/bluetooth/PageComponent.qml	2014-11-07 22:38:03 +0000
@@ -147,17 +147,11 @@
                 text: i18n.tr("Bluetooth")
                 control: Switch {
                     id: btSwitch
-                    // Cannot use onCheckedChanged as this triggers a loop
-                    onClicked: bluetoothActionGroup.enabled.activate()
-                    checked: backend.powered
+                    property bool serverChecked: bluetoothActionGroup.enabled.state
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: bluetoothActionGroup.enabled.activate()
                 }
-                Component.onCompleted: clicked.connect(btSwitch.clicked)
-            }
-
-            Binding {
-                target: btSwitch
-                property: "checked"
-                value: bluetoothActionGroup.enabled.state
             }
 
             // Discoverability
@@ -246,7 +240,7 @@
 
             //  Disconnnected Headset(s)
 
-            ListItem.Standard {
+            SettingsItemTitle {
                 id: disconnectedHeader
                 text: connectedList.visible ? i18n.tr("Connect another device:") : i18n.tr("Connect a device:")
                 enabled: bluetoothActionGroup.enabled
@@ -288,7 +282,7 @@
             }
 
             //  Devices that connect automatically
-            ListItem.Standard {
+            SettingsItemTitle {
                 id: autoconnectHeader
                 text: i18n.tr("Connect automatically when detected:")
                 visible: autoconnectList.visible
@@ -323,7 +317,11 @@
 
     Page {
         id: connectedDevicePage
-        title: backend.selectedDevice ? backend.selectedDevice.name : i18n.tr("None")
+        title: backend.selectedDevice ?
+                  backend.selectedDevice.name.length > 0 ?
+                     backend.selectedDevice.name :
+                     backend.selectedDevice.address
+                  : i18n.tr("None")
         visible: false
 
         Flickable {
@@ -344,7 +342,10 @@
 
                 ListItem.SingleValue {
                     text: i18n.tr("Name")
-                    value: backend.selectedDevice ? backend.selectedDevice.name : i18n.tr("None")
+                    value: backend.selectedDevice &&
+                           backend.selectedDevice.name.length > 0 ?
+                                 backend.selectedDevice.name :
+                                 i18n.tr("None")
                 }
                 ListItem.Standard {
                     Rectangle {
@@ -396,15 +397,15 @@
                     id: trustedCheck
                     text: i18n.tr("Connect automatically when detected:")
                     control: CheckBox {
-                        onClicked: {
+                        property bool serverChecked: backend.selectedDevice ? backend.selectedDevice.trusted : false
+                        onServerCheckedChanged: checked = serverChecked
+                        Component.onCompleted: checked = serverChecked
+                        onTriggered: {
                             if (backend.selectedDevice) {
-                                backend.selectedDevice.trusted = !backend.selectedDevice.trusted
+                                backend.selectedDevice.trusted = checked;
                             }
                         }
-                        checked: backend.selectedDevice ? backend.selectedDevice.trusted : false
                     }
-                    Component.onCompleted:
-                        clicked.connect(trustedCheck.clicked)
                 }
                 ListItem.SingleControl {
                     control: Button {
 
=== modified file 'plugins/bluetooth/devicemodel.cpp'
--- plugins/bluetooth/devicemodel.cpp	2014-09-16 19:41:44 +0000
+++ plugins/bluetooth/devicemodel.cpp	2014-11-07 22:38:03 +0000
@@ -382,6 +382,8 @@
         if (device->isValid()) {
             addDevice(device);
         }
+    } else {
+        device->setProperties(properties);
     }
 }
 
 
=== removed file 'plugins/brightness/BrightnessSlider.qml'
--- plugins/brightness/BrightnessSlider.qml	2014-08-11 16:13:17 +0000
+++ plugins/brightness/BrightnessSlider.qml	1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-/*
- * This file is part of system-settings
- *
- * Copyright (C) 2013-14 Canonical Ltd.
- *
- * Contact: Iain Lane <[e-mail]>
- *
- * 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 warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, 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 Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-import QtQuick 2.0
-import QMenuModel 0.1
-
-Column {
-    signal pressed
-    readonly property bool pressed: sliderId.pressed
-
-    anchors {
-        left: parent.left
-        right: parent.right
-    }
-
-    QDBusActionGroup {
-        id: indicatorPower
-        busType: 1
-        busName: "com.canonical.indicator.power"
-        objectPath: "/com/canonical/indicator/power"
-
-        property variant brightness: action("brightness").state
-        onBrightnessChanged: { 
-            sliderId.enabled = brightness != null
-            sliderId.value = sliderId.enabled ? brightness * 100 : 0.0
-        }
-    }
-
-    Component.onCompleted: indicatorPower.start()
-
-    ListItem.Standard {
-        text: i18n.tr("Display brightness")
-        showDivider: false
-    }
-
-    ListItem.Base {
-
-        Icon {
-            id: iconLeft
-            anchors.verticalCenter: parent.verticalCenter
-            height: sliderId.height - units.gu(1)
-            name: "torch-off"
-            width: height
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: sliderId.value = 0.0
-            }
-        }
-        Slider {
-            id: sliderId
-            function formatValue(v) {
-                return "%1%".arg(v.toFixed(0))
-            }
-
-            anchors {
-                left: iconLeft.right
-                right: iconRight.left
-                leftMargin: units.gu(1)
-                rightMargin: units.gu(1)
-                verticalCenter: parent.verticalCenter
-            }
-            height: parent.height - units.gu(2)
-            minimumValue: 0.0
-            maximumValue: 100.0
-            live: true
-
-            onValueChanged: indicatorPower.action('brightness').updateState(value / 100.0)
-        }
-        Icon {
-            id: iconRight
-            anchors.right: parent.right
-            anchors.verticalCenter: parent.verticalCenter
-            height: sliderId.height - units.gu(1)
-            name: "torch-on"
-            width: height
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: sliderId.value = 100.0
-            }
-        }
-    }
-}
 
=== modified file 'plugins/brightness/CMakeLists.txt'
--- plugins/brightness/CMakeLists.txt	2014-08-11 16:13:17 +0000
+++ plugins/brightness/CMakeLists.txt	2014-11-07 22:38:03 +0000
@@ -1,7 +1,6 @@
 add_subdirectory(plugin)
 
 set(QML_SOURCES
-    BrightnessSlider.qml
     PageComponent.qml
 )
 
 
=== modified file 'plugins/brightness/PageComponent.qml'
--- plugins/brightness/PageComponent.qml	2014-08-12 13:32:30 +0000
+++ plugins/brightness/PageComponent.qml	2014-11-07 22:38:03 +0000
@@ -24,6 +24,8 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.SystemSettings.Brightness 1.0
+import Ubuntu.Settings.Menus 0.1 as Menus
+import QMenuModel 0.1
 
 ItemPage {
     id: root
@@ -39,12 +41,41 @@
         anchors.left: parent.left
         anchors.right: parent.right
 
-        BrightnessSlider {}
+        QDBusActionGroup {
+            id: indicatorPower
+            busType: 1
+            busName: "com.canonical.indicator.power"
+            objectPath: "/com/canonical/indicator/power"
+
+            property variant brightness: action("brightness")
+
+            Component.onCompleted: start()
+        }
 
         Binding {
-            target: autoAdjustCheck
-            property: "checked"
-            value: adjust.visible && gsettings.autoBrightness
+            target: sliderMenu
+            property: "value"
+            value: sliderMenu.enabled ? indicatorPower.action("brightness").state * 100 : 0.0
+        }
+
+        ListItem.Standard {
+            text: i18n.tr("Display brightness")
+            showDivider: false
+        }
+
+        /* Use the SliderMenu component instead of the Slider to avoid binding 
+           issues on valueChanged until LP: #1388094 is fixed.
+        */
+        Menus.SliderMenu {
+            id: sliderMenu
+            objectName: "sliderMenu"
+            enabled: indicatorPower.action("brightness").state != null
+            live: true
+            minimumValue: 0.0
+            maximumValue: 100.0
+            minIcon: "image://theme/display-brightness-min"
+            maxIcon: "image://theme/display-brightness-max"
+            onUpdated: indicatorPower.action("brightness").updateState(value / 100.0)
         }
 
         ListItem.Standard {
@@ -54,10 +85,11 @@
                      brightnessPanel.autoBrightnessAvailable
             control: CheckBox {
                 id: autoAdjustCheck
-                checked: gsettings.autoBrightness
-                onClicked: gsettings.autoBrightness = checked
+                property bool serverChecked: gsettings.autoBrightness
+                onServerCheckedChanged: checked = serverChecked
+                Component.onCompleted: checked = serverChecked
+                onTriggered: gsettings.autoBrightness = checked
             }
-            Component.onCompleted: clicked.connect(autoAdjustCheck.clicked)
             showDivider: false
         }
         ListItem.Caption {
 
=== modified file 'plugins/cellular/Components/CMakeLists.txt'
--- plugins/cellular/Components/CMakeLists.txt	2014-08-29 14:32:28 +0000
+++ plugins/cellular/Components/CMakeLists.txt	2014-11-07 22:38:03 +0000
@@ -1,12 +1,12 @@
 set(QML_SOURCES
+    DataMultiSim.qml
+    DefaultSim.qml
+    MultiSim.qml
     NoSim.qml
-    SingleSim.qml
-    MultiSim.qml
-    CellularSingleSim.qml
-    CellularMultiSim.qml
-    DefaultSim.qml
+    RadioSingleSim.qml
     Sim.qml
     SimEditor.qml
+    SingleSim.qml
 )
 install(FILES ${QML_SOURCES} DESTINATION ${PLUGIN_QML_DIR}/cellular/Components)
 
 
=== removed file 'plugins/cellular/Components/CellularSingleSim.qml'
--- plugins/cellular/Components/CellularSingleSim.qml	2014-08-21 20:25:08 +0000
+++ plugins/cellular/Components/CellularSingleSim.qml	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-/*
- * 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 {
-    height: childrenRect.height
-
-    property var selector: selector
-
-    ListItem.ItemSelector {
-        id: selector
-        objectName: "technologyPreferenceSelector"
-        text: i18n.tr("Cellular data:")
-        expanded: true
-
-        // an empty string is not a valid preference, which means
-        // we disregard the interace and disable the selector
-        enabled: sim.radioSettings.technologyPreference !== ""
-
-        // model for this selector is modemTechnologies, with
-        // 'off' prepended
-        model: {
-            var m = sim.radioSettings.modemTechnologies.slice(0);
-            m.unshift("off");
-            return m;
-        }
-
-        delegate: OptionSelectorDelegate {
-            text: {
-                return {
-                    'off': i18n.tr("Off"),
-                    'gsm': i18n.tr("2G only (saves battery)"),
-                    'umts': i18n.tr("2G/3G (faster)"),
-                    'lte': i18n.tr("2G/3G/4G (faster)")
-                }[modelData]
-            }
-        }
-        selectedIndex: {
-            if (sim.connMan.powered) {
-                // will return -1 if empty, which will select nothing.
-                // Makes sense, since the SIM is online, but the
-                // radioSettings interface is not ready yet (sim locked?)
-                return model.indexOf(sim.radioSettings.technologyPreference);
-            } else {
-                return 0;
-            }
-        }
-    }
-
-    ListItem.Standard {
-        id: dataRoamingItem
-        objectName: "dataRoamingSwitch"
-        text: i18n.tr("Data roaming")
-        enabled: sim.connMan.powered
-        control: Switch {
-            id: dataRoamingControl
-            checked: sim.connMan.roamingAllowed
-            onClicked: sim.connMan.roamingAllowed = checked
-        }
-    }
-
-    Connections {
-        target: sim.connMan
-        onPoweredChanged: {
-            if (powered) {
-                // restore the tech preference
-                selector.selectedIndex = selector
-                    .model.indexOf(sim.radioSettings.technologyPreference)
-            } else {
-                selector.selectedIndex = 0;
-            }
-        }
-    }
-
-    // binds the SIM online state to the UI
-    Binding {
-        target: sim.connMan
-        property: "powered"
-        value: selector.selectedIndex !== 0
-    }
-
-    // binds the tech preference to the UI
-    Binding {
-        target: sim.radioSettings
-        property: "technologyPreference"
-        value: {
-            var i = selector.selectedIndex;
-            if (i > 0) {
-                return selector.model[i]
-            } else {
-                // if the modem is off, disregard the selector
-                return sim.radioSettings.technologyPreference;
-            }
-        }
-    }
-}
 
=== renamed file 'plugins/cellular/Components/CellularMultiSim.qml' => 'plugins/cellular/Components/DataMultiSim.qml'
--- plugins/cellular/Components/CellularMultiSim.qml	2014-10-07 15:41:44 +0000
+++ plugins/cellular/Components/DataMultiSim.qml	2014-11-07 22:38:03 +0000
@@ -22,8 +22,6 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 Column {
-    id: root
-    property var selector: selector
 
     function getNameFromIndex (index) {
         if (index === 0) {
@@ -33,49 +31,11 @@
         }
     }
 
-    function getOnlineSim () {
-        if (state === "sim1Online") {
-            return sims[0];
-        } else if (state === "sim2Online") {
-            return sims[1];
-        } else {
-            return null;
-        }
-    }
-
     height: childrenRect.height
 
-    states: [
-        State {
-            name: "sim1Online"
-            when: sims[0].connMan.powered && !sims[1].connMan.powered
-            StateChangeScript { script: {
-                selector.selectedIndex =
-                    selector.model.indexOf(
-                        sims[0].radioSettings.technologyPreference)
-            }}
-        },
-        State {
-            name: "sim2Online"
-            when: sims[1].connMan.powered && !sims[0].connMan.powered
-            StateChangeScript { script: {
-                selector.selectedIndex =
-                    selector.model.indexOf(
-                        sims[1].radioSettings.technologyPreference)
-            }}
-        },
-        State {
-            name: "bothOnline"
-            when: sims[0].connMan.powered && sims[1].connMan.powered
-            StateChangeScript { script: {
-                sims[1].connMan.powered = false;
-            }}
-        }
-    ]
-
     ListItem.ItemSelector {
         id: use
-        objectName: "use"
+        objectName: "data"
         text: i18n.tr("Cellular data:")
         expanded: true
         model: {
@@ -92,6 +52,7 @@
         }
         selectedIndex: [true, sims[0].connMan.powered, sims[1].connMan.powered]
             .lastIndexOf(true)
+
         onDelegateClicked: {
             // power all sims on or off
             sims.forEach(function (sim) {
@@ -100,95 +61,23 @@
         }
     }
 
-    Connections {
-        target: sims[0].connMan
-        onPoweredChanged: {
-            if (powered) {
-                use.selectedIndex = 1;
-            }
-        }
-    }
-
-    Connections {
-        target: sims[1].connMan
-        onPoweredChanged: {
-            if (powered) {
-                use.selectedIndex = 2;
-            }
-        }
-    }
-
-    ListItem.ItemSelector {
-        id: selector
-        objectName: "technologyPreferenceSelector"
-        expanded: true
-        model: {
-            var sim = getOnlineSim();
-            if (sim) {
-                return sim.radioSettings.modemTechnologies;
-            } else {
-                return [];
-            }
-        }
-        delegate: OptionSelectorDelegate {
-            text: {
-                return {
-                    'gsm': i18n.tr("2G only (saves battery)"),
-                    'umts': i18n.tr("2G/3G (faster)"),
-                    'lte': i18n.tr("2G/3G/4G (faster)")
-                }[modelData]
-            }
-        }
-        visible: use.selectedIndex !== 0
-        onDelegateClicked: {
-            var sim = getOnlineSim();
-            if (sim) {
-                sim.radioSettings.technologyPreference = model[index];
-            }
-        }
-    }
-
-    Binding {
-        target: selector
-        property: "enabled"
-        value: getOnlineSim() &&
-            (getOnlineSim().radioSettings.technologyPreference !== "")
-        when: getOnlineSim()
-    }
-
-    Connections {
-        target: sims[0].radioSettings
-        onTechnologyPreferenceChanged: {
-            if (sims[0].connMan.powered) {
-                selector.selectedIndex = selector.model.indexOf(preference);
-            }
-        }
-    }
-
-    Connections {
-        target: sims[1].radioSettings
-        onTechnologyPreferenceChanged: {
-            if (sims[1].connMan.powered) {
-                selector.selectedIndex = selector.model.indexOf(preference);
-            }
-        }
-    }
-
     ListItem.Standard {
         id: dataRoamingItem
-        objectName: "dataRoamingSwitch"
         text: i18n.tr("Data roaming")
         enabled: use.selectedIndex !== 0
         control: Switch {
             id: dataRoamingControl
-            onClicked: getOnlineSim().connMan.roamingAllowed = checked
+            objectName: "roaming"
+
+            property bool serverChecked: poweredSim && poweredSim.connMan.roamingAllowed
+            onServerCheckedChanged: checked = serverChecked
+            Component.onCompleted: checked = serverChecked
+            onTriggered: {
+                if (poweredSim) {
+                    poweredSim.connMan.roamingAllowed = checked;
+                }
+            }
         }
-    }
-
-    Binding {
-        target: dataRoamingControl
-        property: "checked"
-        value: getOnlineSim() && getOnlineSim().connMan.roamingAllowed
-        when: getOnlineSim()
+        showDivider: false
     }
 }
 
=== modified file 'plugins/cellular/Components/MultiSim.qml'
--- plugins/cellular/Components/MultiSim.qml	2014-10-06 19:38:06 +0000
+++ plugins/cellular/Components/MultiSim.qml	2014-11-07 22:38:03 +0000
@@ -23,21 +23,26 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 Column {
-
     objectName: "multiSim"
 
     property var sims
+    property var poweredSim: {
+        var s = null;
+        sims.forEach(function (sim) {
+            if (sim.connMan.powered === true) {
+                s = sim;
+            }
+        });
+        return s;
+    }
     property var modems
-
     // make settings available to all children of root
     property var settings: phoneSettings
 
-    CellularMultiSim {
-        anchors { left: parent.left; right: parent.right }
+    DataMultiSim {
+        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
@@ -60,15 +65,14 @@
         visible: showAllUI
     }
 
-    ListItem.Divider {
-        visible: hotspotItem.visible || dataUsage.visible
-    }
+    ListItem.Divider {}
 
     ListItem.SingleValue {
         text: i18n.tr("Carriers")
         id: chooseCarrier
-        objectName: "chooseCarrier"
+        objectName: "carriers"
         progression: enabled
+        showDivider: false
         onClicked: {
             pageStack.push(Qt.resolvedUrl("../PageChooseCarriers.qml"), {
                 sims: sims
@@ -88,6 +92,44 @@
         anchors { left: parent.left; right: parent.right }
     }
 
+    ListItem.Divider {}
+
+    function techToString (tech) {
+        return {
+            'gsm': i18n.tr("2G only (saves battery)"),
+            'umts': i18n.tr("2G/3G (faster)"),
+            'lte': i18n.tr("2G/3G/4G (faster)")
+        }[tech]
+    }
+
+    ListItem.ItemSelector {
+        id: radio
+        expanded: true
+        text: i18n.tr("Connection type:")
+        model: poweredSim ? poweredSim.radioSettings.modemTechnologies : []
+        delegate: OptionSelectorDelegate {
+            objectName: poweredSim.path + "_radio_" + modelData
+            text: techToString(modelData)
+        }
+        enabled: poweredSim ?
+            (poweredSim.radioSettings.technologyPreference !== "") : false
+        visible: poweredSim
+        selectedIndex: poweredSim ?
+            model.indexOf(poweredSim.radioSettings.technologyPreference) : -1
+        onDelegateClicked: {
+            poweredSim.radioSettings.technologyPreference = model[index];
+        }
+    }
+
+    Connections {
+        target: poweredSim ? poweredSim.radioSettings : null
+        onTechnologyPreferenceChanged: {
+            radio.selectedIndex =
+                poweredSim.radioSettings.modemTechnologies.indexOf(preference)
+        }
+        ignoreUnknownSignals: true
+    }
+
     GSettings {
         id: phoneSettings
         schema.id: "com.ubuntu.phone"
 
=== modified file 'plugins/cellular/Components/NoSim.qml'
--- plugins/cellular/Components/NoSim.qml	2014-08-19 10:58:01 +0000
+++ plugins/cellular/Components/NoSim.qml	2014-11-07 22:38:03 +0000
@@ -25,27 +25,20 @@
 
     objectName: "noSim"
 
-    ListItem.ItemSelector {
+    ListItem.Standard {
         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
+        control: Switch {
+            checked: false
+        }
     }
 
     ListItem.Standard {
         text: i18n.tr("Data roaming")
         enabled: false
+        showDivider: false
         control: Switch {
             checked: false
         }
     }
-
-    ListItem.Divider {}
-
-    ListItem.SingleValue {
-        text: i18n.tr("Carrier");
-        value: i18n.tr("N/A")
-        enabled: false
-    }
 }
 
=== added file 'plugins/cellular/Components/RadioSingleSim.qml'
--- plugins/cellular/Components/RadioSingleSim.qml	1970-01-01 00:00:00 +0000
+++ plugins/cellular/Components/RadioSingleSim.qml	2014-11-07 22:38:03 +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:
+ * Jonas G. Drange <[e-mail]>
+ *
+*/
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Column {
+    height: childrenRect.height
+
+    property alias selector: selector
+
+    ListItem.ItemSelector {
+        id: selector
+        text: i18n.tr("Connection type:")
+        showDivider: false
+        expanded: true
+
+        // an empty string is not a valid preference, which means
+        // we disregard the interace and disable the selector
+        enabled: sim.radioSettings.technologyPreference !== ""
+        model: sim.radioSettings.modemTechnologies
+
+        delegate: OptionSelectorDelegate {
+            objectName: sim.path + "_radio_" + modelData
+            text: {
+                return {
+                    'gsm': i18n.tr("2G only (saves battery)"),
+                    'umts': i18n.tr("2G/3G (faster)"),
+                    'lte': i18n.tr("2G/3G/4G (faster)")
+                }[modelData]
+            }
+            showDivider: false
+        }
+        selectedIndex: model.indexOf(sim.radioSettings.technologyPreference)
+        onDelegateClicked: {
+            sim.radioSettings.technologyPreference = model[index];
+        }
+    }
+
+}
 
=== modified file 'plugins/cellular/Components/SimEditor.qml'
--- plugins/cellular/Components/SimEditor.qml	2014-08-20 13:48:58 +0000
+++ plugins/cellular/Components/SimEditor.qml	2014-11-07 22:38:03 +0000
@@ -22,15 +22,9 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 Column {
-
     id: simList
     objectName: "simEditor"
 
-    anchors {
-        left: parent.left
-        right: parent.right
-    }
-
     states: [
         State {
             name: "editing"
@@ -73,7 +67,25 @@
         }
     ]
 
+    NumberAnimation {
+        id: scrollerAnimation
+        duration: UbuntuAnimation.SnapDuration
+        easing: UbuntuAnimation.StandardEasing
+        target: root.flickable
+        property: "contentY"
+    }
+
+    function openedEditor () {
+        var flickable = scrollerAnimation.target;
+        var maxFlick = Math.max(0, flickable.contentHeight - root.height);
+        scrollerAnimation.from = flickable.contentY;
+        scrollerAnimation.to = Math.min(y, maxFlick) - units.gu(9); // header
+        scrollerAnimation.start();
+        nameField.forceActiveFocus();
+    }
+
     ListItem.Standard {
+        id: std
         text: i18n.tr("Edit SIM Name")
     }
 
@@ -83,12 +95,14 @@
             right: parent.right
         }
         height: expandedItem ?
-            childrenRect.height + editor.height : childrenRect.height
+            expandedItem.expandedHeight : childrenRect.height
+
+        boundsBehavior: Flickable.StopAtBounds
 
         ListItem.Expandable {
             id: sim1Exp
             expandedHeight: sim1Col.height
-            objectName: "editSim1"
+            objectName: "edit_name_" + sims[0].path
             Column {
                 id: sim1Col
                 anchors {
@@ -102,7 +116,7 @@
                     }
                     height: sim1Exp.collapsedHeight
                     Label {
-                        objectName: "simLabel1"
+                        objectName: "label_" + sims[0].path
                         anchors {
                             left: parent.left
                             right: parent.right
@@ -117,14 +131,15 @@
             }
             onClicked: {
                 simList.state = "editingSim1";
-                nameField.forceActiveFocus();
+                simList.openedEditor();
             }
         }
 
         ListItem.Expandable {
             id: sim2Exp
             expandedHeight: sim2Col.height
-            objectName: "editSim2"
+            objectName: "edit_name_" + sims[1].path
+            showDivider: false
             Column {
                 id: sim2Col
                 anchors {
@@ -138,7 +153,7 @@
                     }
                     height: sim2Exp.collapsedHeight
                     Label {
-                        objectName: "simLabel2"
+                        objectName: "label_" + sims[1].path
                         anchors {
                             left: parent.left
                             right: parent.right
@@ -153,7 +168,7 @@
             }
             onClicked: {
                 simList.state = "editingSim2";
-                nameField.forceActiveFocus();
+                simList.openedEditor();
             }
         }
     }
@@ -182,6 +197,8 @@
 
             spacing: units.gu(2)
 
+            height: cancel.height + rename.height
+
             Button {
                 id: cancel
                 objectName: "cancelRename"
@@ -204,7 +221,7 @@
         }
 
         Item {
-            height: units.gu(1)
+            height: units.gu(2)
             width: parent.width
         }
 
 
=== modified file 'plugins/cellular/Components/SingleSim.qml'
--- plugins/cellular/Components/SingleSim.qml	2014-10-02 09:50:11 +0000
+++ plugins/cellular/Components/SingleSim.qml	2014-11-07 22:38:03 +0000
@@ -27,11 +27,35 @@
 
     property var sim
 
-    CellularSingleSim {
-        anchors { left: parent.left; right: parent.right }
-    }
-
-    ListItem.Divider {}
+    ListItem.Standard {
+        id: selector
+        text: i18n.tr("Cellular data:")
+        control: Switch {
+            id: dataControl
+            objectName: 'data'
+
+            property bool serverChecked: sim.connMan.powered
+            onServerCheckedChanged: checked = serverChecked
+            Component.onCompleted: checked = serverChecked
+            onTriggered: sim.connMan.powered = checked
+        }
+    }
+
+    ListItem.Standard {
+        id: dataRoamingItem
+        text: i18n.tr("Data roaming")
+        enabled: sim.connMan.powered
+        showDivider: false
+        control: Switch {
+            id: dataRoamingControl
+            objectName: "roaming"
+
+            property bool serverChecked: sim.connMan.roamingAllowed
+            onServerCheckedChanged: checked = serverChecked
+            Component.onCompleted: checked = serverChecked
+            onTriggered: sim.connMan.roamingAllowed = checked
+        }
+    }
 
     ListItem.SingleValue {
         text : i18n.tr("Hotspot disabled because Wi-Fi is off.")
@@ -54,10 +78,22 @@
         visible: showAllUI
     }
 
+    ListItem.Divider {
+        visible: radio.selector.model.length
+    }
+
+    RadioSingleSim {
+        id: radio
+        anchors { left: parent.left; right: parent.right }
+        visible: radio.selector.model.length
+    }
+
+    ListItem.Divider {}
+
     ListItem.SingleValue {
         text: i18n.tr("Carrier");
         id: chooseCarrier
-        objectName: "chooseCarrier"
+        objectName: "carrier"
         progression: enabled
         value: sim.netReg.name || i18n.tr("N/A")
         enabled: sim.netReg.status !== ""
 
=== modified file 'plugins/cellular/CustomApnEditor.qml'
--- plugins/cellular/CustomApnEditor.qml	2014-10-06 14:28:46 +0000
+++ plugins/cellular/CustomApnEditor.qml	2014-11-07 22:38:03 +0000
@@ -198,7 +198,7 @@
                     inputMethodHints: Qt.ImhUrlCharactersOnly | Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
                 }
                 Label {
-                    text: "Port"
+                    text: i18n.tr("Port")
                     visible: d.isMms
                 }
                 TextField {
 
=== modified file 'plugins/cellular/PageChooseCarrier.qml'
--- plugins/cellular/PageChooseCarrier.qml	2014-10-06 12:56:18 +0000
+++ plugins/cellular/PageChooseCarrier.qml	2014-11-07 22:38:03 +0000
@@ -149,7 +149,7 @@
 
             ListItem.ItemSelector {
                 id: chooseCarrier
-                objectName: "autoChooseCarrierSelector"
+                objectName: "mode"
                 expanded: true
                 enabled: sim.netReg.mode !== "auto-only"
                 text: i18n.tr("Choose carrier:")
@@ -171,6 +171,7 @@
                     }
                 }
             }
+
             ListItem.SingleControl {
                 enabled: chooseCarrier.selectedIndex === 1
                 anchors {
@@ -198,7 +199,7 @@
                     }
                     ListItem.ItemSelector {
                         id: carrierSelector
-                        objectName: "carrierSelector"
+                        objectName: "carriers"
                         expanded: true
                         enabled: sim.netReg.status !== "searching" && chooseCarrier.selectedIndex === 1
                         // work around ItemSelector not having a visual change depending on being disabled
 
=== modified file 'plugins/cellular/PageChooseCarriers.qml'
--- plugins/cellular/PageChooseCarriers.qml	2014-10-06 19:38:06 +0000
+++ plugins/cellular/PageChooseCarriers.qml	2014-11-07 22:38:03 +0000
@@ -44,7 +44,7 @@
             }
 
             ListItem.SingleValue {
-                objectName: "chooseCarrierSim1"
+                objectName: sims[0].path + "_carriers"
                 value: sims[0].netReg.name ? sims[0].netReg.name : i18n.tr("N/A")
                 enabled: sims[0].netReg.status !== ""
                 progression: true
@@ -61,7 +61,7 @@
             }
 
             ListItem.SingleValue {
-                objectName: "chooseCarrierSim2"
+                objectName: sims[1].path + "_carriers"
                 value: sims[1].netReg.name ? sims[1].netReg.name : i18n.tr("N/A")
                 enabled: sims[1].netReg.status !== ""
                 progression: true
 
=== modified file 'plugins/cellular/PageComponent.qml'
--- plugins/cellular/PageComponent.qml	2014-10-17 14:57:17 +0000
+++ plugins/cellular/PageComponent.qml	2014-11-07 22:38:03 +0000
@@ -94,15 +94,15 @@
             start()
         }
     }
+
     Flickable {
+        id: flick
         anchors.fill: parent
         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/cellular/sims.js'
--- plugins/cellular/sims.js	2014-10-03 14:08:08 +0000
+++ plugins/cellular/sims.js	2014-11-07 22:38:03 +0000
@@ -17,6 +17,16 @@
     return getPresent()[0];
 }
 
+function getFirstOnline () {
+    var online = null;
+    getPresent().forEach(function (sim) {
+        if (sim.connMan.powered === true) {
+            online = sim;
+        }
+    });
+    return online;
+}
+
 function getCount () {
     return getAll().length;
 }
 
=== modified file 'plugins/flight-mode/EntryComponent.qml'
--- plugins/flight-mode/EntryComponent.qml	2014-06-12 08:19:01 +0000
+++ plugins/flight-mode/EntryComponent.qml	2014-11-07 22:38:03 +0000
@@ -29,13 +29,13 @@
     iconFrame: false
     text: i18n.tr(model.displayName)
     control: Switch {
-        id: control
-        checked: helper.inFlightMode
+        property bool serverChecked: helper.inFlightMode
+        onServerCheckedChanged: checked = serverChecked
+        Component.onCompleted: checked = serverChecked
         onTriggered: helper.setFlightMode(checked)
     }
 
     FlightMode.Helper {
         id: helper
-        onInFlightModeChanged: control.checked = inFlightMode
     }
 }
 
=== modified file 'plugins/language/DisplayLanguage.qml'
--- plugins/language/DisplayLanguage.qml	2014-09-03 22:01:57 +0000
+++ plugins/language/DisplayLanguage.qml	2014-11-07 22:38:03 +0000
@@ -73,7 +73,6 @@
 
         onCurrentIndexChanged: {
             i18n.language = plugin.languageCodes[currentIndex]
-            i18n.domain = i18n.domain
         }
     }
 
@@ -107,7 +106,6 @@
 
             onClicked: {
                 i18n.language = initialLanguage
-                i18n.domain = i18n.domain
                 PopupUtils.close(root)
             }
         }
 
=== modified file 'plugins/language/PageComponent.qml'
--- plugins/language/PageComponent.qml	2014-09-03 14:43:44 +0000
+++ plugins/language/PageComponent.qml	2014-11-07 22:38:03 +0000
@@ -71,6 +71,7 @@
             }
             onRevert: {
                 plugin.currentLanguage = to;
+                i18n.language = plugin.languageCodes[to]
             }
         }
     }
@@ -142,9 +143,10 @@
                 text: i18n.tr("Spell checking")
 
                 control: Switch {
-                    checked: settings.spellChecking
-
-                    onClicked: settings.spellChecking = checked
+                    property bool serverChecked: settings.spellChecking
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: settings.spellChecking = checked
                 }
             }
 
@@ -152,9 +154,10 @@
                 text: i18n.tr("Auto correction")
 
                 control: Switch {
-                    checked: settings.autoCompletion
-
-                    onClicked: settings.autoCompletion = checked
+                    property bool serverChecked: settings.autoCompletion
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: settings.autoCompletion = checked
                 }
             }
 
@@ -162,9 +165,10 @@
                 text: i18n.tr("Word suggestions")
 
                 control: Switch {
-                    checked: settings.predictiveText
-
-                    onClicked: settings.predictiveText = checked
+                    property bool serverChecked: settings.predictiveText
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: settings.predictiveText = checked
                 }
             }
 
@@ -175,9 +179,10 @@
                 text: i18n.tr("Auto capitalization")
 
                 control: Switch {
-                    checked: settings.autoCapitalization
-
-                    onClicked: settings.autoCapitalization = checked
+                    property bool serverChecked: settings.autoCapitalization
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: settings.autoCapitalization = checked
                 }
             }
 
@@ -192,9 +197,10 @@
                 text: i18n.tr("Auto punctuation")
 
                 control: Switch {
-                    checked: settings.doubleSpaceFullStop
-
-                    onClicked: settings.doubleSpaceFullStop = checked
+                    property bool serverChecked: settings.doubleSpaceFullStop
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: settings.doubleSpaceFullStop = checked
                 }
             }
 
@@ -209,9 +215,10 @@
                 text: i18n.tr("Keyboard sound")
 
                 control: Switch {
-                    checked: settings.keyPressFeedback
-
-                    onClicked: settings.keyPressFeedback = checked
+                    property bool serverChecked: settings.keyPressFeedback
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: settings.keyPressFeedback = checked
                 }
             }
 
@@ -219,9 +226,10 @@
                 text: i18n.tr("Keyboard vibration")
 
                 control: Switch {
-                    checked: settings.keyPressHapticFeedback
-
-                    onClicked: settings.keyPressHapticFeedback = checked
+                    property bool serverChecked: settings.keyPressHapticFeedback
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: settings.keyPressHapticFeedback = checked
                 }
             }
         }
 
=== modified file 'plugins/language/SpellChecking.qml'
--- plugins/language/SpellChecking.qml	2014-01-30 11:32:47 +0000
+++ plugins/language/SpellChecking.qml	2014-11-07 22:38:03 +0000
@@ -18,6 +18,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+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
@@ -30,15 +32,22 @@
         id: plugin
     }
 
+    GSettings {
+        id: settings
+
+        schema.id: "com.canonical.keyboard.maliit"
+    }
+
     ListItem.Standard {
         id: item
 
         text: i18n.tr("Spell checking")
 
         control: Switch {
-            checked: plugin.spellChecking
-
-            onClicked: plugin.spellChecking = checked
+            property bool serverChecked: settings.spellChecking
+            onServerCheckedChanged: checked = serverChecked
+            Component.onCompleted: checked = serverChecked
+            onTriggered: settings.spellChecking = checked
         }
     }
 
 
=== modified file 'plugins/notifications/PageComponent.qml'
--- plugins/notifications/PageComponent.qml	2014-08-29 09:17:39 +0000
+++ plugins/notifications/PageComponent.qml	2014-11-07 22:38:03 +0000
@@ -46,6 +46,7 @@
                 margins: units.gu(1)
             }
         }
+        highlightWhenPressed: false
     }
 
     ListView {
 
=== modified file 'plugins/orientation-lock/EntryComponent.qml'
--- plugins/orientation-lock/EntryComponent.qml	2014-09-04 11:47:52 +0000
+++ plugins/orientation-lock/EntryComponent.qml	2014-11-07 22:38:03 +0000
@@ -33,10 +33,12 @@
     control: Switch {
         id: control
         objectName: "orientationLockSwitch"
-        checked: systemSettings.rotationLock
-        onClicked: {
-            systemSettings.rotationLock = checked
-        }
+
+        property bool serverChecked: systemSettings.rotationLock
+        onServerCheckedChanged: checked = serverChecked
+        Component.onCompleted: checked = serverChecked
+        onTriggered: systemSettings.rotationLock = checked
+
         GSettings {
             id: systemSettings
             schema.id: "com.ubuntu.touch.system"
 
=== modified file 'plugins/phone/PageComponent.qml'
--- plugins/phone/PageComponent.qml	2014-10-03 14:08:08 +0000
+++ plugins/phone/PageComponent.qml	2014-11-07 22:38:03 +0000
@@ -104,8 +104,10 @@
             ListItem.Standard {
                 control: Switch {
                     objectName: "dialpadSounds"
-                    checked: soundPlugin.dialpadSoundsEnabled
-                    onCheckedChanged: soundPlugin.dialpadSoundsEnabled = checked
+                    property bool serverChecked: soundPlugin.dialpadSoundsEnabled
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: soundPlugin.dialpadSoundsEnabled = checked
                 }
                 text: i18n.tr("Dialpad sounds")
             }
 
=== modified file 'plugins/reset/ResetLauncherHome.qml'
--- plugins/reset/ResetLauncherHome.qml	2014-09-30 11:38:35 +0000
+++ plugins/reset/ResetLauncherHome.qml	2014-11-07 22:38:03 +0000
@@ -55,11 +55,5 @@
             text: i18n.tr("Cancel")
             onClicked: PopupUtils.close(dialog)
         }
-        Label {
-            text: i18n.tr("The phone needs to restart for changes to take effect.")
-            width: parent.width
-            wrapMode: Text.Wrap
-            horizontalAlignment: Text.AlignHCenter
-        }
     }
 }
 
=== modified file 'plugins/security-privacy/Location.qml'
--- plugins/security-privacy/Location.qml	2014-10-21 13:17:01 +0000
+++ plugins/security-privacy/Location.qml	2014-11-07 22:38:03 +0000
@@ -90,6 +90,10 @@
             anchors.left: parent.left
             anchors.right: parent.right
 
+            SettingsItemTitle {
+                text: i18n.tr("Let the phone detect your location:")
+            }
+
             ListItem.ItemSelector {
                 id: detection
 
@@ -112,7 +116,6 @@
                 }
                 property bool allow: selectedIndex !== (model.count - 1)
 
-                text: i18n.tr("Let the phone detect your location:")
                 expanded: true
                 model: optionsModel
                 delegate: optionsDelegate
@@ -220,9 +223,7 @@
                 visible: showAllUI /* hide until the information is real */
             }
 
-            ListItem.Divider {}
-
-            ListItem.Standard {
+            SettingsItemTitle {
                 text: i18n.tr("Allow access to location:")
                 enabled: detection.allow
             }
 
=== modified file 'plugins/security-privacy/LockSecurity.qml'
--- plugins/security-privacy/LockSecurity.qml	2014-09-22 15:21:10 +0000
+++ plugins/security-privacy/LockSecurity.qml	2014-11-07 22:38:03 +0000
@@ -340,7 +340,7 @@
         anchors.left: parent.left
         anchors.right: parent.right
 
-        ListItem.Standard {
+        SettingsItemTitle {
             text: i18n.tr("Unlock the phone using:")
         }
 
 
=== modified file 'plugins/security-privacy/PageComponent.qml'
--- plugins/security-privacy/PageComponent.qml	2014-10-16 13:43:16 +0000
+++ plugins/security-privacy/PageComponent.qml	2014-11-07 22:38:03 +0000
@@ -121,7 +121,7 @@
             anchors.left: parent.left
             anchors.right: parent.right
 
-            ListItem.Standard {
+            ListItem.Header {
                 id: securityTitle
                 text: i18n.tr("Security")
             }
@@ -181,35 +181,29 @@
                         "Encryption protects against access to phone data when the phone is connected to a PC or other device.")
                 visible: showAllUI
             }
-            ListItem.Standard {
+            ListItem.Header {
                 text: i18n.tr("Privacy")
             }
             ListItem.Standard {
                 text: i18n.tr("Stats on welcome screen")
                 control: Switch {
-                    id: welcomeStatsSwitch
-                    checked: securityPrivacy.statsWelcomeScreen
+                    property bool serverChecked: securityPrivacy.statsWelcomeScreen
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: securityPrivacy.statsWelcomeScreen = checked
                 }
             }
-            Binding {
-                target: securityPrivacy
-                property: "statsWelcomeScreen"
-                value: welcomeStatsSwitch.checked
-            }
 
             ListItem.Standard {
                 text: i18n.tr("Messages on welcome screen")
                 control: Switch {
-                    id: welcomeMessagesSwitch
-                    checked: securityPrivacy.messagesWelcomeScreen
+                    property bool serverChecked: securityPrivacy.messagesWelcomeScreen
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: securityPrivacy.messagesWelcomeScreen = checked
                 }
                 visible: showAllUI
             }
-            Binding {
-                target: securityPrivacy
-                property: "messagesWelcomeScreen"
-                value: welcomeMessagesSwitch.checked
-            }
 
             ListItem.SingleValue {
                 id: dashSearchId
 
=== modified file 'plugins/security-privacy/PhoneLocking.qml'
--- plugins/security-privacy/PhoneLocking.qml	2014-09-22 15:21:10 +0000
+++ plugins/security-privacy/PhoneLocking.qml	2014-11-07 22:38:03 +0000
@@ -102,7 +102,7 @@
             visible: showAllUI
         }
 
-        ListItem.Standard {
+        SettingsItemTitle {
             text: i18n.tr("When locked, allow:")
         }
 
@@ -111,8 +111,11 @@
             control: CheckBox {
                 id: launcherCheck
                 enabled: securityPrivacy.securityType !== UbuntuSecurityPrivacyPanel.Swipe
-                checked: securityPrivacy.enableLauncherWhileLocked || !enabled
-                onClicked: securityPrivacy.enableLauncherWhileLocked = checked
+
+                property bool serverChecked: securityPrivacy.enableLauncherWhileLocked || !enabled
+                onServerCheckedChanged: checked = serverChecked
+                Component.onCompleted: checked = serverChecked
+                onTriggered: securityPrivacy.enableLauncherWhileLocked = checked
             }
         }
 
@@ -121,8 +124,11 @@
             control: CheckBox {
                 id: indicatorsCheck
                 enabled: securityPrivacy.securityType !== UbuntuSecurityPrivacyPanel.Swipe
-                checked: securityPrivacy.enableIndicatorsWhileLocked || !enabled
-                onClicked: securityPrivacy.enableIndicatorsWhileLocked = checked
+
+                property bool serverChecked: securityPrivacy.enableIndicatorsWhileLocked || !enabled
+                onServerCheckedChanged: checked = serverChecked
+                Component.onCompleted: checked = serverChecked
+                onTriggered: securityPrivacy.enableIndicatorsWhileLocked = checked
             }
         }
 
 
=== modified file 'plugins/sound/PageComponent.qml'
--- plugins/sound/PageComponent.qml	2014-10-17 15:02:18 +0000
+++ plugins/sound/PageComponent.qml	2014-11-07 22:38:03 +0000
@@ -70,13 +70,15 @@
             ListItem.Standard {
                 control: Switch {
                     objectName: "silentMode"
-                    checked: backendInfo.silentMode
-                    onCheckedChanged: backendInfo.silentMode = checked
+                    property bool serverChecked: backendInfo.silentMode
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: backendInfo.silentMode = checked
                 }
                 text: i18n.tr("Silent Mode")
             }
 
-            ListItem.Standard {
+            SettingsItemTitle {
                 text: i18n.tr("Ringer:")
             }
 
@@ -108,7 +110,7 @@
                 onUpdated: soundActionGroup.volume.updateState(value);
             }
 
-            ListItem.Standard {
+            SettingsItemTitle {
                 text: i18n.tr("Phone calls:")
             }
 
@@ -129,8 +131,10 @@
             ListItem.Standard {
                 control: CheckBox {
                     objectName: "callVibrate"
-                    checked: backendInfo.incomingCallVibrate
-                    onCheckedChanged: backendInfo.incomingCallVibrate = checked
+                    property bool serverChecked: backendInfo.incomingCallVibrate
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: backendInfo.incomingCallVibrate = checked
                 }
                 text: i18n.tr("Vibrate when ringing")
             }
@@ -138,8 +142,10 @@
             ListItem.Standard {
                 control: CheckBox {
                     objectName: "callVibrateSilentMode"
-                    checked: backendInfo.incomingCallVibrateSilentMode
-                    onCheckedChanged: backendInfo.incomingCallVibrateSilentMode = checked
+                    property bool serverChecked: backendInfo.incomingCallVibrateSilentMode
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: backendInfo.incomingCallVibrateSilentMode = checked
                 }
                 text: i18n.tr("Vibrate in Silent Mode")
             }
@@ -147,13 +153,15 @@
             ListItem.Standard {
                 control: Switch {
                     objectName: "dialpadSounds"
-                    checked: backendInfo.dialpadSoundsEnabled
-                    onCheckedChanged: backendInfo.dialpadSoundsEnabled = checked
+                    property bool serverChecked: backendInfo.dialpadSoundsEnabled
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: backendInfo.dialpadSoundsEnabled = checked
                 }
                 text: i18n.tr("Dialpad sounds")
             }
 
-            ListItem.Standard {
+            SettingsItemTitle {
                 text: i18n.tr("Messages:")
             }
 
@@ -173,8 +181,10 @@
             ListItem.Standard {
                 control: CheckBox {
                     objectName: "messageVibrate"
-                    checked: backendInfo.incomingMessageVibrate
-                    onCheckedChanged: backendInfo.incomingMessageVibrate = checked
+                    property bool serverChecked: backendInfo.incomingMessageVibrate
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: backendInfo.incomingMessageVibrate = checked
                 }
                 text: i18n.tr("Vibrate with message sound")
             }
@@ -182,13 +192,15 @@
             ListItem.Standard {
                 control: CheckBox {
                     objectName: "messageVibrateSilentMode"
-                    checked: backendInfo.incomingMessageVibrateSilentMode
-                    onCheckedChanged: backendInfo.incomingMessageVibrateSilentMode = checked
+                    property bool serverChecked: backendInfo.incomingMessageVibrateSilentMode
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: backendInfo.incomingMessageVibrateSilentMode = checked
                 }
                 text: i18n.tr("Vibrate in Silent Mode")
             }
 
-            ListItem.Standard {
+            SettingsItemTitle {
                 text: i18n.tr("Other sounds:")
             }
 
@@ -197,9 +209,10 @@
 
                 control: Switch {
                     objectName: "keyboardSoundSwitch"
-                    checked: keyboardSettings.keyPressFeedback
-
-                    onClicked: keyboardSettings.keyPressFeedback = checked
+                    property bool serverChecked: keyboardSettings.keyPressFeedback
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: keyboardSettings.keyPressFeedback = checked
                 }
             }
 
 
=== modified file 'plugins/sound/sound.cpp'
--- plugins/sound/sound.cpp	2014-10-17 14:57:35 +0000
+++ plugins/sound/sound.cpp	2014-11-07 22:38:03 +0000
@@ -59,6 +59,8 @@
         Q_EMIT incomingCallVibrateSilentModeChanged();
     } else if (property == "IncomingMessageVibrateSilentMode") {
         Q_EMIT incomingMessageVibrateSilentModeChanged();
+    } else if (property == "DialpadSoundsEnabled") {
+        Q_EMIT dialpadSoundsEnabledChanged();
     }
 }
 
@@ -72,6 +74,7 @@
     Q_EMIT incomingMessageVibrateChanged();
     Q_EMIT incomingCallVibrateSilentModeChanged();
     Q_EMIT incomingMessageVibrateSilentModeChanged();
+    Q_EMIT dialpadSoundsEnabledChanged();
 }
 
 QString Sound::getIncomingCallSound()
 
=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2014-10-20 20:53:02 +0000
+++ plugins/system-update/PageComponent.qml	2014-11-07 22:38:03 +0000
@@ -535,11 +535,11 @@
                                 fontSize: "small"
                                 text: {
                                     if (!labelUpdateStatus.visible)
-                                        return convert_bytes_to_size(modelData.binaryFilesize);
+                                        return Utilities.formatSize(modelData.binaryFilesize);
 
                                     return i18n.tr("%1 of %2").arg(
-                                        convert_bytes_to_size(modelData.binaryFilesize * (progress.value * 0.01))).arg(
-                                        convert_bytes_to_size(modelData.binaryFilesize)
+                                        Utilities.formatSize(modelData.binaryFilesize * (progress.value * 0.01))).arg(
+                                        Utilities.formatSize(modelData.binaryFilesize)
                                     );
                                 }
                             }
@@ -640,12 +640,12 @@
                                 elide: Text.ElideRight
                                 fontSize: "small"
                             }
-                            
+
                             Label {
                                 id: labelSize
                                 objectName: "labelSize"
                                 anchors.right: parent.right
-                                text: convert_bytes_to_size(modelData.binaryFilesize)
+                                text: Utilities.formatSize(modelData.binaryFilesize)
                                 fontSize: "small"
                                 visible: !labelUpdateStatus.visible && !installing && !installed
                             }
@@ -773,27 +773,4 @@
             onClicked: pageStack.push(Qt.resolvedUrl("Configuration.qml"))
         }
     }
-
-    function convert_bytes_to_size(bytes) {
-        var SIZE_IN_GIB = 1024.0 * 1024.0 * 1024.0;
-        var SIZE_IN_MIB = 1024.0 * 1024.0;
-        var SIZE_IN_KIB = 1024.0;
-
-        var result = "";
-        var size = 0;
-        if (bytes < SIZE_IN_KIB) {
-            result = bytes + i18n.tr(" bytes");
-        } else if (bytes < SIZE_IN_MIB) {
-            size = (bytes / SIZE_IN_KIB).toFixed(1);
-            result = size + i18n.tr(" KiB");
-        } else if (bytes < SIZE_IN_GIB) {
-            size = (bytes / SIZE_IN_MIB).toFixed(1);
-            result = size + i18n.tr(" MiB");
-        } else {
-            size = (bytes / SIZE_IN_GIB).toFixed(1);
-            result = size + i18n.tr(" GiB");
-        }
-
-        return result;
-    }
 }
 
=== modified file 'plugins/time-date/PageComponent.qml'
--- plugins/time-date/PageComponent.qml	2014-01-29 13:34:37 +0000
+++ plugins/time-date/PageComponent.qml	2014-11-07 22:38:03 +0000
@@ -50,7 +50,7 @@
     Column {
         anchors.fill: parent
 
-        ListItem.Standard { text: i18n.tr ("Time zone:") }
+        SettingsItemTitle { text: i18n.tr ("Time zone:") }
 
         ListItem.SingleValue {
             objectName: "timeZone"
@@ -62,10 +62,13 @@
             onClicked: pageStack.push(Qt.resolvedUrl("ChooseTimeZone.qml"))
         }
 
+        SettingsItemTitle {
+            text: i18n.tr ("Set the time and date:")
+        }
+
         ListItem.ItemSelector {
             id: setTimeAutomatically
             objectName: "timeItemSelector"
-            text: i18n.tr ("Set the time and date:")
             model: [ i18n.tr("Automatically") , i18n.tr("Manually")]
             expanded: true
             onSelectedIndexChanged: {
 
=== modified file 'plugins/wifi/MenuItemFactory.qml'
--- plugins/wifi/MenuItemFactory.qml	2014-09-10 15:39:07 +0000
+++ plugins/wifi/MenuItemFactory.qml	2014-11-07 22:38:03 +0000
@@ -19,6 +19,7 @@
 
 import QtQuick 2.0
 import QMenuModel 0.1 as QMenuModel
+import Ubuntu.Settings.Menus 0.1 as Menus
 
 Item {
     id: menuFactory
@@ -66,15 +67,18 @@
 
     Component {
         id: switchMenu;
-        SwitchMenuItem {
+        Menus.SwitchMenu {
             property QtObject menu: null
-
-            text: menu && menu.label ? menu.label : ""
-            icon: menu ? menu.icon : ""
-            checked: menu ? menu.isToggled : false
-            enabled: menu ? menu.sensitive : false
-
-            onActivate: model.activate(modelIndex);
+            property bool serverChecked: menu && menu.isToggled || false
+
+            text: menu && menu.label || ""
+            iconSource: menu && menu.icon || ""
+            checked: serverChecked
+            enabled: menu && menu.sensitive || false
+
+            onTriggered: model.activate(modelIndex);
+            // Fixes broken check state binding.
+            onServerCheckedChanged: checked = serverChecked;
         }
     }
 
@@ -100,11 +104,12 @@
                 model: menuFactory.model ? menuFactory.model : null
                 name: menu ? menu.ext.xCanonicalWifiApStrengthAction : ""
             }
+            property bool serverChecked: menu && menu.isToggled || false
 
             text: menu && menu.label ? menu.label : ""
             secure: menu ? menu.ext.xCanonicalWifiApIsSecure : false
             adHoc: menu ? menu.ext.xCanonicalWifiApIsAdhoc : false
-            checked: menu ? menu.isToggled : false
+            checked: serverChecked
             signalStrength: strenthAction.valid ? strenthAction.state : 0
             enabled: menu ? menu.sensitive : false
 
@@ -114,6 +119,8 @@
                                                           'x-canonical-wifi-ap-strength-action': 'string'});
             }
             onActivate: model.activate(modelIndex);
+            // Fixes broken check state binding.
+            onServerCheckedChanged: checked = serverChecked;
         }
     }
 
 
=== modified file 'plugins/wifi/PageComponent.qml'
--- plugins/wifi/PageComponent.qml	2014-09-26 12:52:31 +0000
+++ plugins/wifi/PageComponent.qml	2014-11-07 22:38:03 +0000
@@ -138,6 +138,8 @@
                 objectName: "connectToHiddenNetwork"
                 text: i18n.tr("Connect to hidden network…")
                 progression: true
+                visible : (actionGroup.actionObject.valid ?
+                           actionGroup.actionObject.state : false)
                 onClicked: {
                     otherNetworLoader.source = "OtherNetwork.qml";
                     PopupUtils.open(otherNetworLoader.item);
@@ -155,5 +157,4 @@
                             Flickable.DragAndOvershootBounds :
                             Flickable.StopAtBounds
     }
-
 }
 
=== modified file 'po/es.po'
--- po/es.po	2014-10-21 07:26:04 +0000
+++ po/es.po	2014-11-07 22:38:03 +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-10-16 20:04-0600\n"
-"PO-Revision-Date: 2014-10-20 22:13+0000\n"
+"PO-Revision-Date: 2014-10-29 14:53+0000\n"
 "Last-Translator: Víctor R. Ruiz <Unknown>\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-10-21 07:26+0000\n"
+"X-Launchpad-Export-Date: 2014-10-30 06:36+0000\n"
 "X-Generator: Launchpad (build 17203)\n"
 
 #: ubuntu-system-settings.desktop.in.in.h:1 ../src/qml/MainWindow.qml:112
@@ -2360,7 +2360,7 @@
 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:58
 msgid "badges"
-msgstr ""
+msgstr "insignias"
 
 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:60
@@ -2968,42 +2968,3 @@
 #: ../push-helper/software_updates_helper.py:151
 msgid "Tap to open the system updater."
 msgstr "Presione para abrir el actualizador del sistema."
-
-#~ msgid "Searching"
-#~ msgstr "Buscando"
-
-#~ msgid "Refresh"
-#~ msgstr "Actualizar"
-
-#~ msgid "Remove"
-#~ msgstr "Quitar"
-
-#~ msgid "settings"
-#~ msgstr "opciones"
-
-#~ msgid "i18n"
-#~ msgstr "i18n"
-
-#~ msgid "lang"
-#~ msgstr "lengua"
-
-#~ msgid "Available networks"
-#~ msgstr "Redes disponibles"
-
-#~ msgid "Password visible"
-#~ msgstr "Contraseña visible"
-
-#~ msgid "Other network"
-#~ msgstr "Otra red"
-
-#~ msgid "Connect to Wi-Fi"
-#~ msgstr "Conectar a wifi"
-
-#~ msgid "Set lock security"
-#~ msgstr "Establecer la seguridad de bloqueo"
-
-#~ msgid "Those passphrases don't match."
-#~ msgstr "Las contraseñas no coinciden."
-
-#~ msgid "Passphrase must be at least four characters long."
-#~ msgstr "La contraseña debe tener al menos cuatro caracteres."
 
=== modified file 'po/hu.po'
--- po/hu.po	2014-10-18 07:13:30 +0000
+++ po/hu.po	2014-11-07 22:38:03 +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-10-16 20:04-0600\n"
-"PO-Revision-Date: 2014-10-16 10:21+0000\n"
+"PO-Revision-Date: 2014-11-01 09:41+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-10-18 07:10+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-02 06:14+0000\n"
+"X-Generator: Launchpad (build 17211)\n"
 
 #: ubuntu-system-settings.desktop.in.in.h:1 ../src/qml/MainWindow.qml:112
 msgid "System Settings"
@@ -790,7 +790,7 @@
 
 #: ../plugins/cellular//PageChooseCarrier.qml:196
 msgid "Searching for carriers…"
-msgstr ""
+msgstr "Szolgáltatók keresése…"
 
 #: ../plugins/cellular//PageChooseCarrier.qml:229
 #: ../plugins/cellular//PageChooseApn.qml:31
@@ -800,36 +800,36 @@
 
 #: ../plugins/cellular//PageChooseApn.qml:372
 msgid "Internet APN:"
-msgstr ""
+msgstr "Internet APN:"
 
 #: ../plugins/cellular//PageChooseApn.qml:449
 msgid "Custom Internet APN…"
-msgstr ""
+msgstr "Egyéni internet APN…"
 
 #: ../plugins/cellular//PageChooseApn.qml:460
 msgid "MMS APN:"
-msgstr ""
+msgstr "MMS APN:"
 
 #: ../plugins/cellular//PageChooseApn.qml:485
 #: ../plugins/cellular//CustomApnEditor.qml:143
 msgid "Same APN as for Internet"
-msgstr ""
+msgstr "Az internet APN-nel megegyező"
 
 #: ../plugins/cellular//PageChooseApn.qml:565
 msgid "Custom MMS APN…"
-msgstr ""
+msgstr "Egyéni MMS APN…"
 
 #: ../plugins/cellular//PageChooseApn.qml:591
 msgid "Reset APN Settings"
-msgstr ""
+msgstr "APN beállítások visszaállítása"
 
 #: ../plugins/cellular//PageChooseApn.qml:592
 msgid "Are you sure that you want to Reset APN Settings?"
-msgstr ""
+msgstr "Biztos benne, hogy visszaállítja az APN beállításait?"
 
 #: ../plugins/cellular//PageChooseApn.qml:598
 msgid "Reset"
-msgstr ""
+msgstr "Visszaállítás"
 
 #: ../plugins/cellular//PageChooseCarriers.qml:27
 #: ../plugins/cellular//Components//MultiSim.qml:68
@@ -838,43 +838,43 @@
 
 #: ../plugins/cellular//CustomApnEditor.qml:42
 msgid "Internet"
-msgstr ""
+msgstr "Internet"
 
 #: ../plugins/cellular//CustomApnEditor.qml:42
 msgid "MMS"
-msgstr ""
+msgstr "MMS"
 
 #. TRANSLATORS: %1 is either i18n.tr("Internet") or i18n.tr("MMS")
 #: ../plugins/cellular//CustomApnEditor.qml:67
 #, qt-format
 msgid "Custom %1 APN"
-msgstr ""
+msgstr "Egyéni %1 APN"
 
 #. TRANSLATORS: %1 is either i18n.tr("Internet") or i18n.tr("MMS")
 #: ../plugins/cellular//CustomApnEditor.qml:171
 #, qt-format
 msgid "%1 APN"
-msgstr ""
+msgstr "%1 APN"
 
 #: ../plugins/cellular//CustomApnEditor.qml:181
 msgid "MMSC"
-msgstr ""
+msgstr "MMSC"
 
 #: ../plugins/cellular//CustomApnEditor.qml:191
 msgid "Proxy"
-msgstr ""
+msgstr "Proxy"
 
 #: ../plugins/cellular//CustomApnEditor.qml:213
 msgid "Username"
-msgstr ""
+msgstr "Felhasználónév"
 
 #: ../plugins/cellular//CustomApnEditor.qml:264
 msgid "Save"
-msgstr ""
+msgstr "Mentés"
 
 #: ../plugins/cellular//CustomApnEditor.qml:264
 msgid "Activate"
-msgstr ""
+msgstr "Aktiválás"
 
 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
 #: ../plugins/cellular//PageComponent.qml:32
@@ -1773,7 +1773,7 @@
 
 #: ../plugins/system-update//PageComponent.qml:152
 msgid "Installation failed"
-msgstr ""
+msgstr "A telepítés meghiúsult"
 
 #: ../plugins/system-update//PageComponent.qml:156
 #: ../plugins/cellular//Components//SimEditor.qml:200
@@ -1787,7 +1787,7 @@
 #: ../plugins/system-update//PageComponent.qml:235
 #: ../plugins/system-update//PageComponent.qml:241
 msgid "Sorry, the system update failed."
-msgstr ""
+msgstr "Sajnáljuk, a rendszer frissítés meghiúsult."
 
 #: ../plugins/system-update//PageComponent.qml:254
 msgid "Restarting…"
@@ -1799,7 +1799,7 @@
 
 #: ../plugins/system-update//PageComponent.qml:298
 msgid "Connect to the Internet to check for updates"
-msgstr ""
+msgstr "Csatlakozás az internethez a frissítések ellenőrzéséhez"
 
 #: ../plugins/system-update//PageComponent.qml:313
 #: ../plugins/system-update//PageComponent.qml:471
@@ -2116,7 +2116,7 @@
 #: ../wizard/qml/Pages//passwd-confirm.qml:51
 #: ../wizard/qml/Pages//passwd-confirm.qml:52
 msgid "Please try again."
-msgstr "Kérem próbálja újra."
+msgstr "Próbálja újra."
 
 #: ../wizard/qml/Pages//passwd-confirm.qml:52
 msgid "Sorry, incorrect passcode."
@@ -2156,11 +2156,15 @@
 "Ubuntu includes location services provided by HERE, enabling apps to "
 "pinpoint your location."
 msgstr ""
+"Az Ubuntu tartalmazza a HERE helymeghatározó szolgáltatást, amely "
+"megállapítja az Ön pontos helyét az alkalmazások számára."
 
 #: ../wizard/qml/Pages//50-location.qml:64
 msgid ""
 "Allow apps to use your mobile and Wi-Fi networks to determine your location."
 msgstr ""
+"A mobilinternet és Wi-Fi használatának engedélyezése az alkalmazások számára "
+"az Ön pontos helyzetének megállapításához."
 
 #. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
 #: ../wizard/qml/Pages//50-location.qml:74
@@ -2168,16 +2172,18 @@
 "Accept the HERE <a href='terms.qml'>terms and conditions</a> to enable these "
 "services."
 msgstr ""
+"A HERE <a href='terms.qml'>felhasználási feltételeinek</a>  elfogadása a "
+"szolgáltatás engedélyezéséhez."
 
 #: ../wizard/qml/Pages//50-location.qml:85
 msgid ""
 "This service can be disabled at any time from the <b>System Settings</b> "
 "menu."
-msgstr ""
+msgstr "Ez később bármikor kikapcsolható a <b>Rendszerbeállításokban</b>."
 
 #: ../wizard/qml/Pages//60-reporting.qml:22
 msgid "Improving your experience"
-msgstr ""
+msgstr "Javítson az élményen"
 
 #: ../wizard/qml/Pages//60-reporting.qml:34
 msgid ""
@@ -2192,6 +2198,8 @@
 "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
 "Privacy</b>"
 msgstr ""
+"Ezt kikapcsolhatja a <b>Rendszerbeállítások</b> alatt található <b>Biztonság "
+"és adatvédelem</b> alatt"
 
 #: ../wizard/qml/Components//Page.qml:89
 msgid "Back"
@@ -2964,61 +2972,3 @@
 #: ../push-helper/software_updates_helper.py:151
 msgid "Tap to open the system updater."
 msgstr "Koppintson a rendszerfrissítő megnyitásához."
-
-#~ msgid "Refresh"
-#~ msgstr "Frissítés"
-
-#~ msgid "Searching"
-#~ msgstr "Keresés"
-
-#~ msgid "Remove"
-#~ msgstr "Eltávolítás"
-
-#~ msgid "settings"
-#~ msgstr "beállítások"
-
-#~ msgid "i18n"
-#~ msgstr "i18n"
-
-#~ msgid "lang"
-#~ msgstr "nyelv"
-
-#~ msgid "Password visible"
-#~ msgstr "A jelszó látható"
-
-#~ msgid "Available networks"
-#~ msgstr "Elérhető hálózatok"
-
-#~ msgid "Connect to Wi-Fi"
-#~ msgstr "Csatlakozás Wi-Fi hálózathoz"
-
-#~ msgid "Those passphrases don't match."
-#~ msgstr "A jelmondatok nem egyeznek."
-
-#~ msgid "Passphrase must be at least four characters long."
-#~ msgstr "A jelmondatnak legalább négy karakterből kell állnia."
-
-#~ msgid "Set lock security"
-#~ msgstr "Zárolás beállítása"
-
-#~ msgid "Other network"
-#~ msgstr "Egyéb hálózat"
-
-#~ msgid "Bug reporting"
-#~ msgstr "Hibajelentés"
-
-#~ msgid ""
-#~ "I have read and agreed to the HERE <a href='terms.qml'>Terms and "
-#~ "Conditions</a>"
-#~ msgstr ""
-#~ "Elolvastam és elfogadom a HERE <a href='terms.qml'>felhasználási "
-#~ "feltételeit</a>"
-
-#~ msgid "Use your mobile network and Wi-Fi to determine where you are"
-#~ msgstr "Mobilhálózat és Wi-Fi használata az Ön helyzetének megállapításához"
-
-#~ msgid "This can be disabled here:"
-#~ msgstr "Ez kikapcsolható itt:"
-
-#~ msgid "System Settings &gt; Security &amp; Privacy"
-#~ msgstr "Rendszerbeállítások &gt; Biztonság és adatvédelem"
 
=== modified file 'po/pt.po'
--- po/pt.po	2014-10-19 07:05:24 +0000
+++ po/pt.po	2014-11-07 22:38:03 +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-10-16 20:04-0600\n"
-"PO-Revision-Date: 2014-10-18 13:31+0000\n"
+"PO-Revision-Date: 2014-11-01 09:36+0000\n"
 "Last-Translator: Ivo Xavier <[e-mail]>\n"
 "Language-Team: Portuguese <[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-10-19 07:05+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-02 06:14+0000\n"
+"X-Generator: Launchpad (build 17211)\n"
 
 #: ubuntu-system-settings.desktop.in.in.h:1 ../src/qml/MainWindow.qml:112
 msgid "System Settings"
@@ -414,7 +414,7 @@
 
 #: ../plugins/reset//PageComponent.qml:87
 msgid "Reset all system settings…"
-msgstr "Repor todas as definições de sistema..."
+msgstr "Repor todas as definições do sistema..."
 
 #: ../plugins/reset//PageComponent.qml:101
 msgid "Erase & Reset Everything…"
@@ -430,7 +430,7 @@
 
 #: ../plugins/reset//ResetAllSettings.qml:31
 msgid "Reset all system settings"
-msgstr "Repor todas as definições de sistema"
+msgstr "Repor todas as definições do sistema"
 
 #: ../plugins/reset//ResetLauncherHome.qml:40
 msgid "The Launcher will be returned to its original contents."
@@ -1753,12 +1753,12 @@
 #: ../plugins/system-update//PageComponent.qml:118
 msgid "The phone needs to restart to install the system update."
 msgstr ""
-"O telefone tem de reiniciar para instalar as atualizações de sistema."
+"O telemóvel tem de reiniciar para instalar as atualizações do sistema."
 
 #: ../plugins/system-update//PageComponent.qml:118
 msgid "Connect the phone to power before installing the system update."
 msgstr ""
-"Ligue o telemóvel à energia antes de instalar as atualizações de sistema."
+"Ligue o telemóvel à energia antes de instalar as atualizações do sistema."
 
 #: ../plugins/system-update//PageComponent.qml:121
 msgid "Install & Restart"
@@ -1788,7 +1788,7 @@
 #: ../plugins/system-update//PageComponent.qml:235
 #: ../plugins/system-update//PageComponent.qml:241
 msgid "Sorry, the system update failed."
-msgstr "Desculpe, a atualização de sistema falhou."
+msgstr "Desculpe, a atualização do sistema falhou."
 
 #: ../plugins/system-update//PageComponent.qml:254
 msgid "Restarting…"
@@ -2966,47 +2966,8 @@
 
 #: ../push-helper/software_updates_helper.py:150
 msgid "There's an updated system image."
-msgstr "Há uma nova imagem de sistema."
+msgstr "Há uma nova imagem do sistema."
 
 #: ../push-helper/software_updates_helper.py:151
 msgid "Tap to open the system updater."
-msgstr "Carregue para abrir o atualizador de sistema."
-
-#~ msgid "Other network"
-#~ msgstr "Outra rede"
-
-#~ msgid "Remove"
-#~ msgstr "Remover"
-
-#~ msgid "Searching"
-#~ msgstr "A procurar"
-
-#~ msgid "Available networks"
-#~ msgstr "Redes disponíveis"
-
-#~ msgid "Refresh"
-#~ msgstr "Atualizar"
-
-#~ msgid "settings"
-#~ msgstr "definições"
-
-#~ msgid "i18n"
-#~ msgstr "i18n"
-
-#~ msgid "lang"
-#~ msgstr "idioma"
-
-#~ msgid "Password visible"
-#~ msgstr "Palavra-passe visível"
-
-#~ msgid "Connect to Wi-Fi"
-#~ msgstr "Ligar a Wi-Fi"
-
-#~ msgid "Set lock security"
-#~ msgstr "Definir a segurança de bloqueio"
-
-#~ msgid "Those passphrases don't match."
-#~ msgstr "As frase-senha não correspondem."
-
-#~ msgid "Passphrase must be at least four characters long."
-#~ msgstr "A frase-senha deve ter pelo menos quatro caracteres."
+msgstr "Carregue para abrir o atualizador do sistema."
 
=== modified file 'po/ru.po'
--- po/ru.po	2014-10-24 06:39:04 +0000
+++ po/ru.po	2014-11-07 22:38:03 +0000
@@ -8,16 +8,21 @@
 "Project-Id-Version: ubuntu-system-settings\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-10-16 20:04-0600\n"
-"PO-Revision-Date: 2014-10-22 05:38+0000\n"
-"Last-Translator: CSRedRat <Unknown>\n"
+"PO-Revision-Date: 2014-10-30 09:09+0000\n"
+"Last-Translator: ☠Jay ZDLin☠ <Unknown>\n"
 "Language-Team: Russian <[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%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-10-24 06:39+0000\n"
 "X-Generator: Launchpad (build 17203)\n"
+=======
+"X-Launchpad-Export-Date: 2014-10-31 06:43+0000\n"
+"X-Generator: Launchpad (build 17211)\n"
+>>>>>>> MERGE-SOURCE
 
 #: ubuntu-system-settings.desktop.in.in.h:1 ../src/qml/MainWindow.qml:112
 msgid "System Settings"
@@ -137,7 +142,7 @@
 
 #: ../plugins/wifi//Common.qml:50
 msgid "Your authentication details were incorrect"
-msgstr ""
+msgstr "Некорректные данные аутентификации"
 
 #: ../plugins/wifi//Common.qml:52
 msgid "802.1X supplicant disconnected"
@@ -798,7 +803,7 @@
 
 #: ../plugins/cellular//PageChooseCarrier.qml:196
 msgid "Searching for carriers…"
-msgstr ""
+msgstr "Поиск оператора..."
 
 #: ../plugins/cellular//PageChooseCarrier.qml:229
 #: ../plugins/cellular//PageChooseApn.qml:31
@@ -808,7 +813,7 @@
 
 #: ../plugins/cellular//PageChooseApn.qml:372
 msgid "Internet APN:"
-msgstr ""
+msgstr "Интернет APN:"
 
 #: ../plugins/cellular//PageChooseApn.qml:449
 msgid "Custom Internet APN…"
@@ -816,7 +821,7 @@
 
 #: ../plugins/cellular//PageChooseApn.qml:460
 msgid "MMS APN:"
-msgstr ""
+msgstr "MMS APN:"
 
 #: ../plugins/cellular//PageChooseApn.qml:485
 #: ../plugins/cellular//CustomApnEditor.qml:143
@@ -829,15 +834,15 @@
 
 #: ../plugins/cellular//PageChooseApn.qml:591
 msgid "Reset APN Settings"
-msgstr ""
+msgstr "Сброс настроек APN"
 
 #: ../plugins/cellular//PageChooseApn.qml:592
 msgid "Are you sure that you want to Reset APN Settings?"
-msgstr ""
+msgstr "Сбросить настройки APN?"
 
 #: ../plugins/cellular//PageChooseApn.qml:598
 msgid "Reset"
-msgstr ""
+msgstr "Сбросить"
 
 #: ../plugins/cellular//PageChooseCarriers.qml:27
 #: ../plugins/cellular//Components//MultiSim.qml:68
@@ -846,11 +851,11 @@
 
 #: ../plugins/cellular//CustomApnEditor.qml:42
 msgid "Internet"
-msgstr ""
+msgstr "Интернет"
 
 #: ../plugins/cellular//CustomApnEditor.qml:42
 msgid "MMS"
-msgstr ""
+msgstr "MMS"
 
 #. TRANSLATORS: %1 is either i18n.tr("Internet") or i18n.tr("MMS")
 #: ../plugins/cellular//CustomApnEditor.qml:67
@@ -862,7 +867,7 @@
 #: ../plugins/cellular//CustomApnEditor.qml:171
 #, qt-format
 msgid "%1 APN"
-msgstr ""
+msgstr "%1 APN"
 
 #: ../plugins/cellular//CustomApnEditor.qml:181
 msgid "MMSC"
@@ -870,19 +875,19 @@
 
 #: ../plugins/cellular//CustomApnEditor.qml:191
 msgid "Proxy"
-msgstr ""
+msgstr "Прокси"
 
 #: ../plugins/cellular//CustomApnEditor.qml:213
 msgid "Username"
-msgstr ""
+msgstr "Имя пользователя"
 
 #: ../plugins/cellular//CustomApnEditor.qml:264
 msgid "Save"
-msgstr ""
+msgstr "Сохранить"
 
 #: ../plugins/cellular//CustomApnEditor.qml:264
 msgid "Activate"
-msgstr ""
+msgstr "Включить"
 
 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
 #: ../plugins/cellular//PageComponent.qml:32
@@ -952,7 +957,7 @@
 #: ../plugins/security-privacy//LockSecurity.qml:96
 #: ../plugins/security-privacy//LockSecurity.qml:384
 msgid "Change passcode…"
-msgstr ""
+msgstr "Изменение секретного кода..."
 
 #: ../plugins/security-privacy//LockSecurity.qml:98
 #: ../plugins/security-privacy//LockSecurity.qml:385
@@ -965,7 +970,7 @@
 
 #: ../plugins/security-privacy//LockSecurity.qml:107
 msgid "Switch to passcode"
-msgstr ""
+msgstr "Перейти на код"
 
 #: ../plugins/security-privacy//LockSecurity.qml:109
 msgid "Switch to passphrase"
@@ -973,7 +978,7 @@
 
 #: ../plugins/security-privacy//LockSecurity.qml:118
 msgid "Existing passcode"
-msgstr ""
+msgstr "Существующий код"
 
 #: ../plugins/security-privacy//LockSecurity.qml:120
 msgid "Existing passphrase"
@@ -981,7 +986,7 @@
 
 #: ../plugins/security-privacy//LockSecurity.qml:174
 msgid "Choose passcode"
-msgstr ""
+msgstr "Выбрать код"
 
 #: ../plugins/security-privacy//LockSecurity.qml:176
 msgid "Choose passphrase"
@@ -990,7 +995,7 @@
 #: ../plugins/security-privacy//LockSecurity.qml:220
 #: ../wizard/qml/Pages//passwd-confirm.qml:48
 msgid "Confirm passcode"
-msgstr ""
+msgstr "Подтвердить код"
 
 #: ../plugins/security-privacy//LockSecurity.qml:222
 #: ../wizard/qml/Pages//passwd-confirm.qml:47
@@ -999,7 +1004,7 @@
 
 #: ../plugins/security-privacy//LockSecurity.qml:265
 msgid "Those passcodes don't match. Try again."
-msgstr ""
+msgstr "Коды не совпадают. Попробуйте снова."
 
 #: ../plugins/security-privacy//LockSecurity.qml:268
 msgid "Those passphrases don't match. Try again."
@@ -1019,7 +1024,7 @@
 
 #: ../plugins/security-privacy//LockSecurity.qml:349
 msgid "4-digit passcode"
-msgstr ""
+msgstr "4-значный код"
 
 #: ../plugins/security-privacy//LockSecurity.qml:350
 #: ../plugins/security-privacy//PhoneLocking.qml:47
@@ -1033,7 +1038,7 @@
 
 #: ../plugins/security-privacy//LockSecurity.qml:352
 msgid "4-digit passcode…"
-msgstr ""
+msgstr "4-значный код..."
 
 #: ../plugins/security-privacy//LockSecurity.qml:353
 msgid "Passphrase…"
@@ -1053,8 +1058,9 @@
 #, qt-format
 msgid "Incorrect PIN. %1 attempt remaining."
 msgid_plural "Incorrect PIN. %1 attempts remaining."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Неверный ПИН. Осталась %1 попытка."
+msgstr[1] "Неверный ПИН. Осталось %1 попытки."
+msgstr[2] "Неверный ПИН. Осталось %1 попыток."
 
 #: ../plugins/security-privacy//SimPin.qml:81
 msgid "Current PIN:"
@@ -1064,8 +1070,9 @@
 #, qt-format
 msgid "%1 attempt allowed."
 msgid_plural "%1 attempts allowed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Допускается %1 попытка."
+msgstr[1] "Допускается %1 попытки."
+msgstr[2] "Допускается %1 попыток."
 
 #: ../plugins/security-privacy//SimPin.qml:107
 msgid "Choose new PIN:"
@@ -1135,7 +1142,7 @@
 #: ../plugins/security-privacy//PhoneLocking.qml:46
 #: ../wizard/qml/Pages//30-passwd-type.qml:95
 msgid "Passcode"
-msgstr ""
+msgstr "Секретный код"
 
 #. TRANSLATORS: %1 is the number of minutes
 #: ../plugins/security-privacy//PhoneLocking.qml:75
@@ -1153,11 +1160,11 @@
 
 #: ../plugins/security-privacy//PhoneLocking.qml:106
 msgid "When locked, allow:"
-msgstr ""
+msgstr "Разрешить на заблокированном:"
 
 #: ../plugins/security-privacy//PhoneLocking.qml:110
 msgid "Launcher"
-msgstr ""
+msgstr "Панель запуска"
 
 #: ../plugins/security-privacy//PhoneLocking.qml:120
 msgid "Notifications and quick settings"
@@ -1779,7 +1786,7 @@
 
 #: ../plugins/system-update//PageComponent.qml:152
 msgid "Installation failed"
-msgstr ""
+msgstr "Сбой установки"
 
 #: ../plugins/system-update//PageComponent.qml:156
 #: ../plugins/cellular//Components//SimEditor.qml:200
@@ -1793,7 +1800,7 @@
 #: ../plugins/system-update//PageComponent.qml:235
 #: ../plugins/system-update//PageComponent.qml:241
 msgid "Sorry, the system update failed."
-msgstr ""
+msgstr "К сожалению, не удалось обновить систему."
 
 #: ../plugins/system-update//PageComponent.qml:254
 msgid "Restarting…"
@@ -1805,7 +1812,7 @@
 
 #: ../plugins/system-update//PageComponent.qml:298
 msgid "Connect to the Internet to check for updates"
-msgstr ""
+msgstr "Подключитесь к интернету, чтобы проверить наличие обновлений"
 
 #: ../plugins/system-update//PageComponent.qml:313
 #: ../plugins/system-update//PageComponent.qml:471
@@ -2030,7 +2037,7 @@
 
 #: ../plugins/security-privacy//diagnostics//PageComponent.qml:90
 msgid "Includes info about what an app was doing when it failed."
-msgstr ""
+msgstr "Включает информацию о приложении на момент возникновения ошибки."
 
 #: ../src/qml/MainWindow.qml:133
 msgid "Search"
@@ -2046,23 +2053,23 @@
 
 #: ../wizard/qml/Pages//30-passwd-type.qml:72
 msgid "Please select how you’d like to unlock your phone."
-msgstr ""
+msgstr "Выберите способ разблокировки телефона."
 
 #: ../wizard/qml/Pages//30-passwd-type.qml:92
 msgid "Swipe"
-msgstr ""
+msgstr "Смахивание"
 
 #: ../wizard/qml/Pages//30-passwd-type.qml:93
 msgid "No security"
-msgstr ""
+msgstr "Без пароля"
 
 #: ../wizard/qml/Pages//30-passwd-type.qml:96
 msgid "4 numbers"
-msgstr ""
+msgstr "4 цифры"
 
 #: ../wizard/qml/Pages//30-passwd-type.qml:99
 msgid "Numbers and letters"
-msgstr ""
+msgstr "Цифры и буквы"
 
 #: ../wizard/qml/Pages//30-passwd-type.qml:112
 #: ../wizard/qml/Pages//40-wifi.qml:196 ../wizard/qml/Pages//10-welcome.qml:85
@@ -2095,15 +2102,15 @@
 
 #: ../wizard/qml/Pages//31-passwd-set.qml:48
 msgid "Enter passphrase"
-msgstr ""
+msgstr "Введите кодовую фразу"
 
 #: ../wizard/qml/Pages//31-passwd-set.qml:49
 msgid "Choose your passcode"
-msgstr ""
+msgstr "Выберите секретный код"
 
 #: ../wizard/qml/Pages//31-passwd-set.qml:56
 msgid "Passphrase must be 4 characters long"
-msgstr ""
+msgstr "Кодовая фраза должна состоять из 4 символов"
 
 #: ../wizard/qml/Pages//20-sim.qml:23
 msgid "Add a SIM card and restart your device"
@@ -2116,7 +2123,7 @@
 
 #: ../wizard/qml/Pages//passwd-confirm.qml:51
 msgid "Sorry, incorrect passphrase."
-msgstr ""
+msgstr "Неверная кодовая фраза."
 
 #: ../wizard/qml/Pages//passwd-confirm.qml:51
 #: ../wizard/qml/Pages//passwd-confirm.qml:52
@@ -2125,7 +2132,7 @@
 
 #: ../wizard/qml/Pages//passwd-confirm.qml:52
 msgid "Sorry, incorrect passcode."
-msgstr ""
+msgstr "Неверный секретный код."
 
 #: ../wizard/qml/Pages//80-finished.qml:22
 msgid "All done"
@@ -2166,6 +2173,8 @@
 msgid ""
 "Allow apps to use your mobile and Wi-Fi networks to determine your location."
 msgstr ""
+"Разрешить приложениям использовать мобильные и Wi-Fi сети для определения "
+"вашего местонахождения."
 
 #. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
 #: ../wizard/qml/Pages//50-location.qml:74
@@ -2189,12 +2198,16 @@
 "Your phone is set up to automatically report errors to Canonical and its "
 "partners, the makers of the operating system."
 msgstr ""
+"Ваш телефон настроен на автоматическую отправку отчётов об ошибках в "
+"компанию Canonical и её партнерам, производителям операционной системы."
 
 #: ../wizard/qml/Pages//60-reporting.qml:41
 msgid ""
 "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
 "Privacy</b>"
 msgstr ""
+"Данную функцию можно отключить, перейдя в <b>Параметры системы</b>, раздел "
+"<b>Защита и приватность</b>"
 
 #: ../wizard/qml/Components//Page.qml:89
 msgid "Back"
@@ -2203,12 +2216,12 @@
 #: ../wizard/qml/Components//StackButton.qml:40
 #, qt-format
 msgid "〈  %1"
-msgstr ""
+msgstr "〈  %1"
 
 #: ../wizard/qml/Components//StackButton.qml:43
 #, qt-format
 msgid "%1  〉"
-msgstr ""
+msgstr "%1  〉"
 
 #. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:4
@@ -2303,19 +2316,19 @@
 #. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:38
 msgid "hidden"
-msgstr ""
+msgstr "скрытые"
 
 #. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:40
 msgid "ip"
-msgstr ""
+msgstr "ip"
 
 #. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:42
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:294
 msgid "address"
-msgstr ""
+msgstr "адрес"
 
 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
@@ -2363,22 +2376,22 @@
 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:60
 msgid "facebook"
-msgstr ""
+msgstr "facebook"
 
 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:62
 msgid "twitter"
-msgstr ""
+msgstr "twitter"
 
 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:64
 msgid "flickr"
-msgstr ""
+msgstr "flickr"
 
 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:66
 msgid "gmail"
-msgstr ""
+msgstr "gmail"
 
 #. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:70
@@ -2388,7 +2401,7 @@
 #. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:72
 msgid "silent"
-msgstr ""
+msgstr "в фоновом режиме"
 
 #. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:74
@@ -2417,7 +2430,7 @@
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:82
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:118
 msgid "keyboard"
-msgstr ""
+msgstr "клавиатура"
 
 #. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:84
@@ -2527,12 +2540,12 @@
 #. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:130
 msgid "punctuation"
-msgstr ""
+msgstr "пунктуация"
 
 #. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:132
 msgid "layout"
-msgstr ""
+msgstr "раскладка"
 
 #. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
 #. TRANSLATORS: This is a keyword or name for the brightness plugin which is used while searching
@@ -2544,12 +2557,12 @@
 #. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:136
 msgid "words"
-msgstr ""
+msgstr "слова"
 
 #. TRANSLATORS: This is a keyword or name for the language plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:138
 msgid "vibration"
-msgstr ""
+msgstr "вибро"
 
 #. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
@@ -2561,7 +2574,7 @@
 #. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:144
 msgid "services"
-msgstr ""
+msgstr "службы"
 
 #. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:146
@@ -2571,7 +2584,7 @@
 #. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:148
 msgid "waiting"
-msgstr ""
+msgstr "ожидание"
 
 #. TRANSLATORS: This is a keyword or name for the phone plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:150
@@ -2633,27 +2646,27 @@
 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:184
 msgid "4g"
-msgstr ""
+msgstr "4g"
 
 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:186
 msgid "3g"
-msgstr ""
+msgstr "3g"
 
 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:188
 msgid "2g"
-msgstr ""
+msgstr "2g"
 
 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:190
 msgid "lte"
-msgstr ""
+msgstr "lte"
 
 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:192
 msgid "apn"
-msgstr ""
+msgstr "apn"
 
 #. TRANSLATORS: This is a keyword or name for the cellular plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:194
@@ -2665,7 +2678,7 @@
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:196
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:226
 msgid "sim"
-msgstr ""
+msgstr "sim"
 
 #. TRANSLATORS: This is a keyword or name for the example plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:198
@@ -2710,7 +2723,7 @@
 #. TRANSLATORS: This is a keyword or name for the flight-mode plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:214
 msgid "airplane"
-msgstr ""
+msgstr "автономно"
 
 #. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:220
@@ -2725,22 +2738,22 @@
 #. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:228
 msgid "pin"
-msgstr ""
+msgstr "пин"
 
 #. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:230
 msgid "code"
-msgstr ""
+msgstr "код"
 
 #. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:232
 msgid "password"
-msgstr ""
+msgstr "пароль"
 
 #. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:234
 msgid "passphrase"
-msgstr ""
+msgstr "кодовая фраза"
 
 #. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:236
@@ -2750,7 +2763,7 @@
 #. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:238
 msgid "allow"
-msgstr ""
+msgstr "разрешить"
 
 #. TRANSLATORS: This is a keyword or name for the security-privacy plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:240
@@ -2812,7 +2825,7 @@
 #. TRANSLATORS: This is a keyword or name for the bluetooth plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:276
 msgid "stereo"
-msgstr ""
+msgstr "стерео"
 
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:280
@@ -2832,27 +2845,27 @@
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:290
 msgid "imei"
-msgstr ""
+msgstr "imei"
 
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:292
 msgid "serial"
-msgstr ""
+msgstr "серийный номер"
 
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:296
 msgid "mac"
-msgstr ""
+msgstr "mac"
 
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:298
 msgid "licenses"
-msgstr ""
+msgstr "лицензии"
 
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:300
 msgid "developer"
-msgstr ""
+msgstr "разработчик"
 
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:304
@@ -2872,7 +2885,7 @@
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:310
 msgid "version"
-msgstr ""
+msgstr "версия"
 
 #. TRANSLATORS: This is a keyword or name for the about plugin which is used while searching
 #: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:312
@@ -2926,11 +2939,11 @@
 
 #: ../plugins/security-privacy//securityprivacy.cpp:318
 msgid "Incorrect passcode. Try again."
-msgstr ""
+msgstr "Неправильный код. Попробуйте ещё раз."
 
 #: ../plugins/security-privacy//securityprivacy.cpp:320
 msgid "Incorrect passphrase. Try again."
-msgstr ""
+msgstr "Неправильная кодовая фраза. Попробуйте ещё раз."
 
 #: ../plugins/security-privacy//securityprivacy.cpp:323
 msgid "Could not set security mode"
@@ -2963,39 +2976,3 @@
 #: ../push-helper/software_updates_helper.py:151
 msgid "Tap to open the system updater."
 msgstr "Нажмите для открытия мастера обновления системы."
-
-#~ msgid "Searching"
-#~ msgstr "Поиск"
-
-#~ msgid "Refresh"
-#~ msgstr "Обновить"
-
-#~ msgid "Remove"
-#~ msgstr "Удалить"
-
-#~ msgid "settings"
-#~ msgstr "настройки"
-
-#~ msgid "i18n"
-#~ msgstr "i18n"
-
-#~ msgid "lang"
-#~ msgstr "язык"
-
-#~ msgid "Password visible"
-#~ msgstr "Отображать пароль"
-
-#~ msgid "Other network"
-#~ msgstr "Другая сеть"
-
-#~ msgid "Connect to Wi-Fi"
-#~ msgstr "Подключиться к Wi-Fi"
-
-#~ msgid "Available networks"
-#~ msgstr "Доступные сети"
-
-#~ msgid "Those passphrases don't match."
-#~ msgstr "Кодовые фразы не совпадают."
-
-#~ msgid "Passphrase must be at least four characters long."
-#~ msgstr "Кодовая фраза должна содержать не менее четырёх символов."
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-09-02 15:44:19 +0000
+++ src/CMakeLists.txt	2014-11-07 22:38:03 +0000
@@ -1,3 +1,5 @@
+include_directories(${GLIB_INCLUDE_DIRS})
+
 add_definitions(-DI18N_DIRECTORY="${CMAKE_INSTALL_PREFIX}/share/locale")
 add_definitions(-DI18N_DOMAIN="ubuntu-system-settings")
 add_definitions(-DPLUGIN_PRIVATE_MODULE_DIR="${PLUGIN_PRIVATE_MODULE_DIR}")
@@ -23,13 +25,14 @@
     qml/MainWindow.qml
     qml/UncategorizedItemsView.qml
     SystemSettings/ItemPage.qml
+    SystemSettings/SettingsItemTitle.qml
 )
 
 QT5_ADD_RESOURCES(system-settings-resources ui.qrc)
 
 add_executable(system-settings ${USS_SOURCES} ${QML_SOURCES} ${system-settings-resources})
 qt5_use_modules(system-settings Core Gui Quick Qml)
-target_link_libraries(system-settings SystemSettings)
+target_link_libraries(system-settings SystemSettings ${GLIB_LDFLAGS})
 install(TARGETS system-settings RUNTIME DESTINATION bin)
 
 add_library(uss-accountsservice SHARED accountsservice.h accountsservice.cpp)
 
=== modified file 'src/SystemSettings/CMakeLists.txt'
--- src/SystemSettings/CMakeLists.txt	2014-08-11 16:13:17 +0000
+++ src/SystemSettings/CMakeLists.txt	2014-11-07 22:38:03 +0000
@@ -1,5 +1,6 @@
 set(QML_SOURCES
     ItemPage.qml
+    SettingsItemTitle.qml
 )
 
 set(PLUG_DIR ${PLUGIN_QML_DIR}/SystemSettings)
 
=== added file 'src/SystemSettings/SettingsItemTitle.qml'
--- src/SystemSettings/SettingsItemTitle.qml	1970-01-01 00:00:00 +0000
+++ src/SystemSettings/SettingsItemTitle.qml	2014-11-07 22:38:03 +0000
@@ -0,0 +1,38 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2013 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+ListItem.Standard {
+    id: itemEmpty
+    property string text
+    Label {
+        anchors {
+            left: parent.left
+            leftMargin: units.gu(2)
+            right: parent.right
+            rightMargin: units.gu(2)
+            top: parent.top
+            topMargin: units.gu(3)
+        }
+        text: itemEmpty.text
+    }
+    highlightWhenPressed: false
+}
 
=== modified file 'src/SystemSettings/qmldir'
--- src/SystemSettings/qmldir	2014-08-11 16:13:17 +0000
+++ src/SystemSettings/qmldir	2014-11-07 22:38:03 +0000
@@ -1,2 +1,3 @@
 module SystemSettings
 ItemPage 1.0 ItemPage.qml
+SettingsItemTitle 1.0 SettingsItemTitle.qml
 
=== modified file 'src/main.cpp'
--- src/main.cpp	2014-10-21 15:20:07 +0000
+++ src/main.cpp	2014-11-07 22:38:03 +0000
@@ -85,6 +85,7 @@
                      Qt::QueuedConnection);
     qmlRegisterType<QAbstractItemModel>();
     qmlRegisterType<SystemSettings::PluginManager>("SystemSettings", 1, 0, "PluginManager");
+    view.engine()->rootContext()->setContextProperty("Utilities", new Utilities());
     view.setResizeMode(QQuickView::SizeRootObjectToView);
     view.engine()->addImportPath(PLUGIN_PRIVATE_MODULE_DIR);
     view.engine()->addImportPath(PLUGIN_QML_DIR);
 
=== modified file 'src/utils.cpp'
--- src/utils.cpp	2014-07-23 13:29:15 +0000
+++ src/utils.cpp	2014-11-07 22:38:03 +0000
@@ -21,6 +21,7 @@
 #include "utils.h"
 #include "debug.h"
 
+#include <glib.h>
 #include <QUrl>
 #include <QUrlQuery>
 
@@ -59,4 +60,20 @@
     }
 }
 
+Utilities::Utilities(QObject *parent) :
+    QObject(parent)
+{
+}
+
+QString Utilities::formatSize(quint64 size) const
+{
+    guint64 g_size = size;
+
+    gchar * formatted_size = g_format_size (g_size);
+    QString q_formatted_size = QString::fromLocal8Bit(formatted_size);
+    g_free (formatted_size);
+
+    return q_formatted_size;
+}
+
 } // namespace
 
=== modified file 'src/utils.h'
--- src/utils.h	2013-09-30 09:29:34 +0000
+++ src/utils.h	2014-11-07 22:38:03 +0000
@@ -29,6 +29,14 @@
 void parsePluginOptions(const QStringList &arguments, QString &defaultPlugin,
                         QVariantMap &pluginOptions);
 
+class Utilities : public QObject {
+    Q_OBJECT
+
+public:
+    explicit Utilities(QObject *parent = 0);
+    Q_INVOKABLE QString formatSize(quint64) const;
+};
+
 } // namespace
 
 #endif // SYSTEM_SETTINGS_UTILS_H
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-09-03 15:38:36 +0000
+++ tests/CMakeLists.txt	2014-11-07 22:38:03 +0000
@@ -1,4 +1,5 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ../src)
+include_directories(${GLIB_INCLUDE_DIRS})
 add_definitions(-DI18N_DOMAIN="ubuntu-system-settings")
 add_definitions(-DPLUGIN_PRIVATE_MODULE_DIR="${PLUGIN_PRIVATE_MODULE_DIR}")
 add_definitions(-DPLUGIN_MANIFEST_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
@@ -36,6 +37,7 @@
 set_tests_properties(tst-plugins PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
 
 qt5_use_modules(tst-arguments Core Test)
+target_link_libraries(tst-arguments ${GLIB_LDFLAGS})
 add_test(tst-arguments tst-arguments)
 
 add_executable(tst-pagelist tst_pagelist.cpp ../wizard/PageList.cpp)
 
=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2014-09-26 12:52:31 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2014-11-07 22:38:03 +0000
@@ -1,3 +1,4 @@
+
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Copyright (C) 2014 Canonical Ltd.
@@ -114,6 +115,10 @@
     def go_to_wifi_page(self):
         return self._go_to_page('entryComponent-wifi', 'wifiPage')
 
+    @autopilot.logging.log_action(logger.debug)
+    def go_to_cellular_page(self):
+        return self._go_to_page('entryComponent-cellular', 'cellularPage')
+
     def _go_to_page(self, item_object_name, page_object_name):
         self.click_item(item_object_name)
         page = self.wait_select_single(objectName=page_object_name)
@@ -202,7 +207,7 @@
         self._orientation_lock_switch.uncheck()
 
 
-class CelullarPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+class CellularPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
     """Autopilot helper for the Sound page."""
 
@@ -214,6 +219,164 @@
                 return True
         return False
 
+    @autopilot.logging.log_action(logger.debug)
+    def enable_data(self):
+        self._set_data(True)
+
+    @autopilot.logging.log_action(logger.debug)
+    def disable_data(self):
+        self._set_data(False)
+
+    def disable_datas(self):
+        self.select_sim_for_data('off')
+
+    @autopilot.logging.log_action(logger.debug)
+    def _set_data(self, data):
+        chk = self.select_single(objectName='data')
+        if data:
+            chk.check()
+        else:
+            chk.uncheck()
+
+    @autopilot.logging.log_action(logger.debug)
+    def get_data(self):
+        return self.select_single(objectName='data').checked
+
+    @autopilot.logging.log_action(logger.debug)
+    def enable_roaming(self, timeout=10):
+        self._set_roaming(True, timeout=timeout)
+
+    @autopilot.logging.log_action(logger.debug)
+    def disable_roaming(self, timeout=10):
+        self._set_roaming(False, timeout=timeout)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _set_roaming(self, roaming, timeout):
+        chk = self.select_single(objectName='roaming')
+        if roaming:
+            chk.check(timeout=timeout)
+        else:
+            chk.uncheck(timeout=timeout)
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_connection_type(self, radio_type, sim='/ril_0',
+                            scroll_to_and_click=None):
+        self._set_connection_type(radio_type, sim, scroll_to_and_click)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _set_connection_type(self, radio_type, sim, scroll_to_and_click):
+        t = self.wait_select_single(
+            'OptionSelectorDelegate',
+            objectName='%s_radio_%s' % (sim, radio_type))
+        if scroll_to_and_click:
+            scroll_to_and_click(t)
+        else:
+            t.swipe_into_view()
+
+        self.pointing_device.click_object(t)
+
+    @autopilot.logging.log_action(logger.debug)
+    def change_carrier(self, carrier, sim=None):
+        if sim:
+            carriersPage = self._click_carriers()
+            carrierPage = carriersPage.select_sim(sim)
+        else:
+            carrierPage = self._click_carrier()
+
+        carrierPage.set_manual()
+        carrierPage.set_carrier(carrier)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _click_carrier(self):
+        item = self.select_single(objectName='carrier')
+        self.pointing_device.click_object(item)
+        return self.get_root_instance().wait_select_single(
+            objectName='chooseCarrierPage')
+
+    @autopilot.logging.log_action(logger.debug)
+    def _click_carriers(self):
+        item = self.select_single(objectName='carriers')
+        self.pointing_device.click_object(item)
+        return self.get_root_instance().wait_select_single(
+            objectName='chooseCarriersPage')
+
+    @autopilot.logging.log_action(logger.debug)
+    def select_sim_for_data(self, sim):
+        self._select_sim_for_data(sim)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _select_sim_for_data(self, sim):
+        item = self.select_single(objectName='use%s' % sim)
+        self.pointing_device.click_object(item)
+
+    @autopilot.logging.log_action(logger.debug)
+    def select_sim_for_calls(self, sim):
+        pass
+
+    @autopilot.logging.log_action(logger.debug)
+    def select_sim_for_messages(self):
+        pass
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_name(self, sim, name):
+        self._set_name(sim, name)
+
+    def get_name(self, sim):
+        obj = self.select_single(
+            objectName="label_%s" % sim)
+        return obj.text
+
+    def _set_name(self, sim, name):
+        obj = self.select_single(
+            objectName="edit_name_%s" % sim)
+        self.pointing_device.click_object(obj)
+
+        # wait for animation
+        sleep(1)
+        ok = self.select_single('Button', objectName="doRename")
+
+        field = self.select_single('TextField', objectName="nameField")
+        field.write(name)
+        self.pointing_device.click_object(ok)
+
+
+class PageChooseCarriers(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    """Autopilot helper for carrier selection page (multisim)."""
+
+    @autopilot.logging.log_action(logger.debug)
+    def select_sim(self, sim):
+        return self._select_sim(sim)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _select_sim(self, sim):
+        item = self.select_single(objectName='%s_carriers' % sim)
+        self.pointing_device.click_object(item)
+        return self.get_root_instance().wait_select_single(
+            objectName='chooseCarrierPage')
+
+
+class PageChooseCarrier(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    """Autopilot helper for carrier selection page (singlesim)."""
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_manual(self):
+        item = self.select_single(text='Manually')
+        self.pointing_device.click_object(item)
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_automatic(self):
+        item = self.select_single(text='Automatically')
+        self.pointing_device.click_object(item)
+
+    def set_carrier(self, carrier):
+        # wait for animation, since page.animationRunning.wait_for(False)
+        # does not work?
+        sleep(0.5)
+        item = self.select_single(text=carrier)
+        self.pointing_device.click_object(item)
+
 
 class TimeAndDatePage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
@@ -678,6 +841,40 @@
                 return True
         return False
 
+    @autopilot.logging.log_action(logger.debug)
+    def enable_wireless(self):
+        self._set_wireless(True)
+
+    @autopilot.logging.log_action(logger.debug)
+    def disable_wireless(self):
+        self._set_wireless(False)
+
+    """
+    :returns: Whether or not WiFi can be used
+    """
+    @autopilot.logging.log_action(logger.debug)
+    def have_wireless(self):
+        try:
+            self.wait_select_single('SwitchMenuItem', text=_('Wi-Fi'))
+        except:
+            return False
+        return True
+
+    """Returns the current WiFi state
+
+    :returns: Whether or not WiFi is enabled
+    """
+    @autopilot.logging.log_action(logger.debug)
+    def get_wireless(self):
+        return self.wait_select_single(
+            'SwitchMenuItem', text=_('Wi-Fi')).checked
+
+    @autopilot.logging.log_action(logger.debug)
+    def _set_wireless(self, state):
+        obj = self.wait_select_single('SwitchMenuItem', text=_('Wi-Fi'))
+        if obj.checked != state:
+            self.pointing_device.click_object(obj)
+
     """Connects to hidden network
 
     :param name: Network name string (SSID)
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-10-22 21:34:08 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-11-07 22:38:03 +0000
@@ -33,6 +33,7 @@
 RDO_IFACE = 'org.ofono.RadioSettings'
 SIM_IFACE = 'org.ofono.SimManager'
 NETREG_IFACE = 'org.ofono.NetworkRegistration'
+NETOP_IFACE = 'org.ofono.NetworkOperator'
 CALL_FWD_IFACE = 'org.ofono.CallForwarding'
 CALL_SETTINGS_IFACE = 'org.ofono.CallSettings'
 SYSTEM_IFACE = 'com.canonical.SystemImage'
@@ -150,7 +151,7 @@
     def mock_carriers(self, name):
         self.dbusmock.AddObject(
             '/%s/operator/op2' % name,
-            'org.ofono.NetworkOperator',
+            NETOP_IFACE,
             {
                 'Name': 'my.cool.telco',
                 'Status': 'available',
@@ -167,7 +168,7 @@
         # Add a forbidden carrier
         self.dbusmock.AddObject(
             '/%s/operator/op3' % name,
-            'org.ofono.NetworkOperator',
+            NETOP_IFACE,
             {
                 'Name': 'my.bad.telco',
                 'Status': 'forbidden',
@@ -311,9 +312,12 @@
 
 
 class CellularBaseTestCase(UbuntuSystemSettingsOfonoTestCase):
+
     def setUp(self):
         """ Go to Cellular page """
-        super(CellularBaseTestCase, self).setUp('cellular')
+        super(CellularBaseTestCase, self).setUp()
+        self.cellular_page = self.system_settings.\
+            main_view.go_to_cellular_page()
 
 
 class PhoneOfonoBaseTestCase(UbuntuSystemSettingsOfonoTestCase):
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_cellular.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-10-09 14:09:38 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-11-07 22:38:03 +0000
@@ -5,537 +5,217 @@
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
 
-import dbus
 from gi.repository import Gio, GLib
 from time import sleep
 
 from autopilot.introspection.dbus import StateNotFoundError
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals, NotEquals, raises
-from unittest import skip
+from testtools.matchers import Equals, raises, StartsWith
 
 from ubuntu_system_settings.tests import (
-    CellularBaseTestCase, CONNMAN_IFACE, RDO_IFACE, SIM_IFACE)
-from ubuntu_system_settings.utils.i18n import ugettext as _
-
-from ubuntuuitoolkit import emulators as toolkit_emulators
-
-
-PREFERENCE_2G = '2G only (saves battery)'
-PREFERENCE_UMTS = '2G/3G (faster)'
-PREFERENCE_LTE = '2G/3G/4G (faster)'
-PREFERENCE_OFF = 'Off'
-USE_OFF = "useoff"
-USE_SIM_1 = "use/ril_0"
-USE_SIM_2 = "use/ril_1"
+    CellularBaseTestCase, CONNMAN_IFACE, RDO_IFACE, NETREG_IFACE)
 
 
 class CellularTestCase(CellularBaseTestCase):
-    """ Tests for cellular Page """
-
-    """Caches the technology preference selector"""
-    _pref_selector = None
-
-    @property
-    def data_preference_selector(self):
-        """Return data_preference_selector"""
-        try:
-            self._pref_selector.get_properties()
-        except:
-            self._pref_selector = \
-                self.system_settings.main_view.cellular_page.select_single(
-                    toolkit_emulators.ItemSelector,
-                    objectName="technologyPreferenceSelector"
-                )
-        return self._pref_selector
-
-    def select_preference(self, label):
-        """Helper method to click a preference which matches provided label"""
-        pref = self.data_preference_selector.select_single('Label', text=label)
-        self.system_settings.main_view.pointing_device.click_object(pref)
-
-    def assert_selected_preference(self, index):
-        """Helper method asserting that the selected data technology preference
-        is that of index"""
-        self.assertThat(self.data_preference_selector.selectedIndex,
-                        Eventually(Equals(index)))
-
-    def navigate_to_carrier_page(self):
-        selector = self.system_settings.main_view.cellular_page.select_single(
-            objectName="chooseCarrier"
-        )
-        self.system_settings.main_view.scroll_to_and_click(selector)
-
-    def navigate_to_manual(self):
-        selector = self.choose_carrier_page.select_single(
-            toolkit_emulators.ItemSelector,
-            objectName="autoChooseCarrierSelector"
-        )
-        manual = selector.select_single('Label', text=_("Manually"))
-        self.system_settings.main_view.pointing_device.click_object(manual)
-        choosecarrier = self.system_settings.main_view.cellular_page.\
-            select_single(objectName="chooseCarrier")
-        self.system_settings.main_view.pointing_device.click_object(
-            choosecarrier)
-        self.assertThat(
-            self.system_settings.main_view.choose_page.title,
-            Equals(_("Carrier"))
-        )
-
-    def test_cellular_page(self):
-        """ Checks whether Cellular page is available """
-        self.assertThat(
-            self.system_settings.main_view.cellular_page,
-            NotEquals(None)
-        )
-        self.assertThat(
-            self.system_settings.main_view.cellular_page.title,
-            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()
-        self.navigate_to_manual()
-        carriers = self.system_settings.main_view.choose_page.select_single(
-            toolkit_emulators.ItemSelector,
-            objectName="carrierSelector"
-        )
-        # TODO: Once there is a proper ItemSelector emulator, get the items
-        # from it and check 'fake.tel' is the selected one.
-        selected_delegate = carriers.select_single(
-            'OptionSelectorDelegate', selected=True)
-        selected_delegate.select_single('Label', text="fake.tel")
-
-    def test_alt_network(self):
-        """ Tests whether an alternative available network is displayed """
-        self.navigate_to_carrier_page()
-        self.navigate_to_manual()
-        carriers = self.system_settings.main_view.choose_page.select_single(
-            toolkit_emulators.ItemSelector,
-            objectName="carrierSelector"
-        )
-        manual = carriers.select_single('Label', text="my.cool.telco")
-        self.assertThat(manual, NotEquals(None))
+
+    def test_enable_data(self):
+        self.cellular_page.enable_data()
+        self.assertThat(
+            lambda: self.modem_0.Get(CONNMAN_IFACE, 'Powered'),
+            Eventually(Equals(True))
+        )
+
+    def test_disable_data(self):
+        self.cellular_page.disable_data()
+        self.assertThat(
+            lambda: self.modem_0.Get(CONNMAN_IFACE, 'Powered'),
+            Eventually(Equals(False))
+        )
+
+    def test_remote_manipulation_of_data(self):
+        self.modem_0.EmitSignal(
+            CONNMAN_IFACE,
+            'PropertyChanged',
+            'sv',
+            ['Powered', 'true'])
+
+        self.assertThat(lambda: self.cellular_page.get_data(),
+                        Eventually(Equals(True)))
+
+        self.modem_0.EmitSignal(
+            CONNMAN_IFACE,
+            'PropertyChanged',
+            'sv',
+            ['Powered', 'false'])
+
+        self.assertThat(lambda: self.cellular_page.get_data(),
+                        Eventually(Equals(False)))
+
+    def test_enable_roaming(self):
+        self.cellular_page.enable_roaming()
+        self.assertThat(
+            lambda: self.modem_0.Get(CONNMAN_IFACE, 'RoamingAllowed'),
+            Eventually(Equals(True))
+        )
+
+    def test_disable_roaming(self):
+        self.cellular_page.disable_roaming()
+        self.assertThat(
+            lambda: self.modem_0.Get(CONNMAN_IFACE, 'RoamingAllowed'),
+            Eventually(Equals(False))
+        )
+
+    def test_connection_type(self):
+        get_pref = lambda: self.modem_0.Get(RDO_IFACE, 'TechnologyPreference')
+        for pref in ['lte', 'umts', 'gsm']:
+            self.cellular_page.set_connection_type(pref)
+            self.assertThat(get_pref, Eventually(Equals(pref)))
+
+    def test_current_carrier(self):
+        self.assertThat(lambda: self.modem_0.Get(NETREG_IFACE, 'Name'),
+                        Eventually(Equals('fake.tel')))
+
+    def test_change_carrier(self):
+        self.cellular_page.change_carrier('my.cool.telco')
 
     def test_no_forbidden_network(self):
         """ Ensures that a forbidden network is not shown """
-        self.navigate_to_carrier_page()
-        self.navigate_to_manual()
-        carriers = self.system_settings.main_view.choose_page.select_single(
-            toolkit_emulators.ItemSelector,
-            objectName="carrierSelector"
-        )
         self.assertThat(
-            lambda: carriers.select_single('Label', text="my.bad.telco"),
+            lambda: self.cellular_page.change_carrier('my.bad.telco'),
             raises(StateNotFoundError)
         )
 
-    def test_set_sim_offline(self):
-        self.select_preference(PREFERENCE_OFF)
-
-        sleep(0.7)
-
-        self.assertEqual(False, self.modem_0.Get(CONNMAN_IFACE, 'Powered'))
-
-    def test_set_sim_online(self):
-        self.select_preference(PREFERENCE_OFF)
-        sleep(0.7)
-        self.assertEqual(False, self.modem_0.Get(CONNMAN_IFACE, 'Powered'))
-
-        self.select_preference(PREFERENCE_UMTS)
-        sleep(0.7)
-        self.assertEqual(True, self.modem_0.Get(CONNMAN_IFACE, 'Powered'))
-
-    def test_roaming_switch(self):
-        """Test that switching off cellular data disables roaming switch"""
-        roaming_switch = self.system_settings.main_view.select_single(
-            objectName="dataRoamingSwitch"
-        )
-        # select 2G only
-        self.select_preference(PREFERENCE_2G)
-
-        # assert that roaming_switch is enabled
-        self.assertThat(
-            roaming_switch.get_properties()['enabled'],
-            Eventually(Equals(True)))
-
-        # click off
-        self.select_preference(PREFERENCE_OFF)
-        # assert roaming_switch is disabled
-        self.assertThat(
-            roaming_switch.get_properties()['enabled'],
-            Eventually(Equals(False)))
-
-    def test_allow_roaming(self):
-        roaming_switch = self.system_settings.main_view.select_single(
-            objectName="dataRoamingSwitch"
-        )
-        self.system_settings.main_view.scroll_to_and_click(roaming_switch)
-        sleep(1.5)
-        self.assertEqual(
-            True, self.modem_0.Get(CONNMAN_IFACE, 'RoamingAllowed'))
-
-    def test_change_data_preference(self):
-        self.select_preference(PREFERENCE_2G)
-        sleep(0.7)
-        self.assertEqual('gsm', self.modem_0.Get(RDO_IFACE,
-                                                 'TechnologyPreference'))
-        self.select_preference(PREFERENCE_UMTS)
-        sleep(0.7)
-        self.assertEqual('umts', self.modem_0.Get(RDO_IFACE,
-                                                  'TechnologyPreference'))
-
-    def test_sim_online_status_insensitive_to_radio_preference(self):
-        # turn off cellular data
-        self.select_preference(PREFERENCE_OFF)
-
-        # fake dbus signal, changing to umts
-        self.modem_0.EmitSignal(
-            'org.ofono.RadioSettings',
-            'PropertyChanged',
-            'sv',
-            ['TechnologyPreference',  dbus.String('umts', variant_level=1)])
-
-        # assert that "Off" has not changed
-        self.assert_selected_preference(0)
-
-    def test_ui_reacts_to_sim_set_coming_online(self):
-        self.select_preference(PREFERENCE_2G)
-        self.select_preference(PREFERENCE_OFF)
-
-        sleep(0.7)
-
-        self.modem_0.EmitSignal(
-            CONNMAN_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['Powered', 'true'])
-
-        # assert that 2G is selected
-        self.assert_selected_preference(1)
-
-    def test_unlocking_sim(self):
-        '''Like it would if the sim was locked, e.g.'''
-        self.modem_0.Set(RDO_IFACE, 'TechnologyPreference',
-                         dbus.String('', variant_level=1))
-
-        self.system_settings.main_view.go_back()
-
-        self.system_settings.main_view.pointing_device.click_object(
-            self.system_settings.main_view.select_single(
-                objectName='entryComponent-cellular'))
-
-        self.assert_selected_preference(-1)
-        self.assertFalse(self.data_preference_selector.enabled)
-
-        self.modem_0.EmitSignal(
-            'org.ofono.RadioSettings',
-            'PropertyChanged',
-            'sv',
-            ['TechnologyPreference',  dbus.String('lte', variant_level=1)])
-
-        self.assert_selected_preference(3)
-
 
 class DualSimCellularTestCase(CellularBaseTestCase):
 
     use_sims = 2
 
-    def navigate_to_carriers_page(self):
-        selector = self.system_settings.main_view.cellular_page.select_single(
-            objectName="chooseCarrier"
-        )
-        self.system_settings.main_view.scroll_to_and_click(selector)
-
-    def navigate_to_carrier_page_for_sim(self, n):
-        selector = self.choose_carriers_page.select_single(
-            objectName="chooseCarrierSim%d" % n
-        )
-        self.system_settings.main_view.scroll_to_and_click(selector)
-
-    def navigate_to_manual(self):
-        selector = self.choose_carrier_page.select_single(
-            toolkit_emulators.ItemSelector,
-            objectName="autoChooseCarrierSelector"
-        )
-        manual = selector.select_single('Label', text=_("Manually"))
-        self.system_settings.main_view.scroll_to_and_click(manual)
-        choosecarrier = self.system_settings.main_view.cellular_page.\
-            select_single(objectName="chooseCarrier")
-        self.system_settings.main_view.scroll_to_and_click(choosecarrier)
-        self.assertThat(
-            self.system_settings.main_view.choose_page.title,
-            Equals(_("Carrier"))
-        )
-
-    @property
-    def data_preference_selector(self):
-        """Return data_preference_selector"""
+    def test_data_off(self):
+        self.cellular_page.disable_datas()
+        self.assertThat(
+            lambda: self.modem_0.Get(CONNMAN_IFACE, 'Powered'),
+            Eventually(Equals(False))
+        )
+        self.assertThat(
+            lambda: self.modem_1.Get(CONNMAN_IFACE, 'Powered'),
+            Eventually(Equals(False))
+        )
+
+    def test_sim1_online(self):
+        self.cellular_page.select_sim_for_data('/ril_0')
+        self.assertThat(
+            lambda: self.modem_0.Get(CONNMAN_IFACE, 'Powered'),
+            Eventually(Equals(True))
+        )
+        self.assertThat(
+            lambda: self.modem_1.Get(CONNMAN_IFACE, 'Powered'),
+            Eventually(Equals(False))
+        )
+
+    def test_sim2_online(self):
+        self.cellular_page.select_sim_for_data('/ril_1')
+        self.assertThat(
+            lambda: self.modem_0.Get(CONNMAN_IFACE, 'Powered'),
+            Eventually(Equals(False))
+        )
+        self.assertThat(
+            lambda: self.modem_1.Get(CONNMAN_IFACE, 'Powered'),
+            Eventually(Equals(True))
+        )
+
+    def test_connection_type_on_sim1(self):
+        sim = '/ril_0'
+        stac = self.system_settings.main_view.scroll_to_and_click
+        self.cellular_page.select_sim_for_data(sim)
+        get_pref = lambda: self.modem_0.Get(RDO_IFACE, 'TechnologyPreference')
+        for pref in ['lte', 'umts', 'gsm']:
+            self.cellular_page.set_connection_type(
+                pref, sim=sim, scroll_to_and_click=stac)
+            self.assertThat(get_pref, Eventually(Equals(pref)))
+
+    def test_connection_type_on_sim2(self):
+        sim = '/ril_1'
+        stac = self.system_settings.main_view.scroll_to_and_click
+        self.cellular_page.select_sim_for_data(sim)
+        get_pref = lambda: self.modem_1.Get(RDO_IFACE, 'TechnologyPreference')
+        for pref in ['gsm']:
+            self.cellular_page.set_connection_type(
+                pref, sim=sim, scroll_to_and_click=stac)
+            self.assertThat(get_pref, Eventually(Equals(pref)))
+
+    def test_current_carrier_sim1(self):
+        self.assertThat(lambda: self.modem_0.Get(NETREG_IFACE, 'Name'),
+                        Eventually(Equals('fake.tel')))
+
+    def test_change_carrier_sim1(self):
+        sim = '/ril_0'
+        self.cellular_page.change_carrier('my.cool.telco', sim=sim)
+
+    def test_current_carrier_sim2(self):
+        self.assertThat(lambda: self.modem_1.Get(NETREG_IFACE, 'Name'),
+                        Eventually(Equals('fake.tel')))
+
+    def test_change_carrier_sim2(self):
+        sim = '/ril_1'
+        self.cellular_page.change_carrier('my.cool.telco', sim=sim)
+
+    def test_change_sim1_name(self):
+        gsettings = Gio.Settings.new('com.ubuntu.phone')
+        sim = '/ril_0'
         try:
-            self._pref_selector.get_properties()
+            old_name = gsettings.get_value('sim-names')[sim]
         except:
-            self._pref_selector = \
-                self.system_settings.main_view.cellular_page.select_single(
-                    toolkit_emulators.ItemSelector,
-                    objectName="technologyPreferenceSelector"
-                )
-        return self._pref_selector
-
-    def select_preference(self, label):
-        """Helper method that clicks a preference
-        that matches provided label"""
-        pref = self.data_preference_selector.select_single('Label', text=label)
-        self.system_settings.main_view.scroll_to_and_click(pref)
-
-    def assert_selected_preference(self, index):
-        """Helper method asserting that the selected
-        data technology preference is that of index"""
-        self.assertThat(
-            self.data_preference_selector.selectedIndex,
-            Eventually(Equals(index)))
-
-    def use_selector(self, label):
-        obj = self.system_settings.main_view.cellular_page.select_single(
-            objectName="use"
-        ).select_single(objectName=label)
-        self.system_settings.main_view.scroll_to_and_click(obj)
-
-    def assert_used(self, index):
-        obj = self.system_settings.main_view.cellular_page.select_single(
-            objectName="use"
-        )
-        self.assertThat(
-            obj.selectedIndex, Eventually(Equals(index)))
-
-    def get_sim_name(self, num):
-        obj = self.system_settings.main_view.cellular_page.select_single(
-            objectName="simLabel%d" % num)
-        return obj.get_properties()['text']
-
-    def rename_sim(self, num, new_name):
-        obj = self.system_settings.main_view.cellular_page.select_single(
-            objectName="simEditor"
-        ).select_single(objectName="editSim%d" % num)
-        self.system_settings.main_view.scroll_to_and_click(obj)
-        field = self.system_settings.main_view.cellular_page.select_single(
-            objectName="nameField"
-        )
-        self.system_settings.main_view.scroll_to_and_click(field)
-        self.system_settings.main_view.scroll_to_and_click(
-            field.select_single(objectName="clear_button"))
-        self.keyboard.type(new_name)
-        self.system_settings.main_view.scroll_to_and_click(
-            self.system_settings.main_view.cellular_page.select_single(
-                objectName="doRename"))
-
-    def test_use_sim_1(self):
-        self.use_selector(USE_OFF)
-        self.use_selector(USE_SIM_1)
-        sleep(0.7)
-        self.assertEqual(True, self.modem_0.Get(CONNMAN_IFACE, 'Powered'))
-        self.assertEqual(False, self.modem_1.Get(CONNMAN_IFACE, 'Powered'))
-
-    def test_use_sim_2(self):
-        self.use_selector(USE_OFF)
-        self.use_selector(USE_SIM_2)
-        sleep(0.7)
-        self.assertEqual(False, self.modem_0.Get(CONNMAN_IFACE, 'Powered'))
-        self.assertEqual(True, self.modem_1.Get(CONNMAN_IFACE, 'Powered'))
-
-    def test_turn_off_both_sims(self):
-        self.use_selector(USE_OFF)
-        sleep(0.7)
-        self.assertEqual(False, self.modem_0.Get(CONNMAN_IFACE, 'Powered'))
-        self.assertEqual(False, self.modem_1.Get(CONNMAN_IFACE, 'Powered'))
-
-    def test_use_gsm_for_sim_1(self):
-        self.use_selector(USE_SIM_1)
-        self.select_preference(PREFERENCE_2G)
-        sleep(0.7)
-        self.assertEqual(
-            'gsm', self.modem_0.Get(RDO_IFACE, 'TechnologyPreference'))
-
-    def test_use_umts_for_sim_1(self):
-        self.use_selector(USE_SIM_1)
-        self.select_preference(PREFERENCE_UMTS)
-        sleep(0.7)
-        self.assertEqual(
-            'umts', self.modem_0.Get(RDO_IFACE, 'TechnologyPreference'))
-
-    def test_use_gsm_for_sim_2(self):
-        self.use_selector(USE_SIM_1)
-        self.select_preference(PREFERENCE_2G)
-        sleep(0.7)
-        self.assertEqual(
-            'gsm', self.modem_0.Get(RDO_IFACE, 'TechnologyPreference'))
-
-    def test_when_sim_1_comes_online_ui_is_correct(self):
-        self.use_selector(USE_SIM_1)
-        self.select_preference(PREFERENCE_UMTS)
-        self.use_selector(USE_OFF)
-        sleep(0.7)
-        self.modem_0.Set(CONNMAN_IFACE, 'Powered', True)
-        self.modem_0.EmitSignal(
-            CONNMAN_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['Powered', 'true'])
-
-        self.assertEqual(
-            'umts', self.modem_0.Get(RDO_IFACE, 'TechnologyPreference'))
-        self.assert_used(1)
-        self.assert_selected_preference(1)
-
-    def test_when_sim_2_comes_online_ui_is_correct(self):
-        self.use_selector(USE_SIM_2)
-        self.select_preference(PREFERENCE_2G)
-        self.use_selector(USE_OFF)
-        sleep(2)
-        self.modem_1.Set(CONNMAN_IFACE, 'Powered', True)
-        self.modem_1.EmitSignal(
-            CONNMAN_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['Powered', 'true'])
-
-        self.assertEqual(
-            'gsm', self.modem_1.Get(RDO_IFACE, 'TechnologyPreference'))
-        self.assert_used(2)
-        self.assert_selected_preference(0)
-
-    def test_roaming_switch(self):
-        roaming_switch = self.system_settings.main_view.select_single(
-            objectName="dataRoamingSwitch"
-        )
-        # assert that roaming_switch is enabled
-        self.assertTrue(roaming_switch.get_properties()['enabled'])
-
-        # click off
-        self.use_selector(USE_OFF)
-
-        # assert roaming_switch is disabled
-        self.assertThat(
-            roaming_switch.get_properties()['enabled'],
-            Eventually(Equals(False)))
-
-    def test_allow_roaming(self):
-        self.use_selector(USE_SIM_1)
-        self.assertEqual(
-            False, self.modem_0.Get(CONNMAN_IFACE, 'RoamingAllowed'))
-        roaming_switch = self.system_settings.main_view.select_single(
-            objectName="dataRoamingSwitch"
-        )
-        self.system_settings.main_view.scroll_to_and_click(roaming_switch)
-        sleep(1.5)
-        self.assertEqual(
-            True, self.modem_0.Get(CONNMAN_IFACE, 'RoamingAllowed'))
-
-    def test_no_radio_preference(self):
-        self.select_preference(PREFERENCE_UMTS)
-        self.use_selector(USE_OFF)
-
-        self.modem_0.Set(RDO_IFACE, 'TechnologyPreference', '')
-        self.modem_0.EmitSignal(
-            CONNMAN_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['TechnologyPreference', ''])
-
-        self.assertThat(
-            self.data_preference_selector.get_properties()['visible'],
-            Eventually(Equals(False)))
-
-    # see
-    # https://gitorious.org/python-dbusmock/python-dbusmock/merge_requests/3
-    @skip('skipped due to bug in dbusmock')
-    def test_change_op_sim_1(self):
-        self.navigate_to_carriers_page()
-        self.navigate_to_carrier_page_for_sim(1)
-        carriers = self.system_settings.main_view.choose_page.select_single(
-            toolkit_emulators.ItemSelector, objectName="carrierSelector")
-        manual = carriers.select_single('Label', text="my.cool.telco")
-        self.assertThat(manual, NotEquals(None))
-
-    # see
-    # https://gitorious.org/python-dbusmock/python-dbusmock/merge_requests/3
-    @skip('skipped due to bug in dbusmock')
-    def test_change_op_sim_2(self):
-        self.navigate_to_carriers_page()
-        self.navigate_to_carrier_page_for_sim(2)
-        carriers = self.system_settings.main_view.choose_page.select_single(
-            toolkit_emulators.ItemSelector, objectName="carrierSelector")
-        manual = carriers.select_single('Label', text="my.cool.telco")
-        self.assertThat(manual, NotEquals(None))
-
-    def test_radio_preference_changes(self):
-        self.use_selector(USE_SIM_1)
-
-        self.modem_0.Set(RDO_IFACE, 'TechnologyPreference', 'umts')
-        self.modem_0.EmitSignal(
-            RDO_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['TechnologyPreference', 'umts'])
-
-        self.assert_selected_preference(1)
-
-    def test_changing_sim1_name(self):
-        gsettings = Gio.Settings.new('com.ubuntu.phone')
-        old_name = gsettings.get_value('sim-names')['/ril_0']
+            old_name = 'SIM 1'
         new_name = 'FOO BAR'
-        self.rename_sim(1, new_name)
+        self.cellular_page.set_name(sim, new_name)
 
-        # wait for gsettings
-        sleep(1)
         try:
-            self.assertEqual(
-                new_name, gsettings.get_value('sim-names')['/ril_0'])
+            self.assertThat(
+                lambda: gsettings.get_value('sim-names')[sim],
+                Eventually(Equals(new_name)))
         except Exception as e:
             raise e
         finally:
-            self.rename_sim(1, old_name)
+            self.cellular_page.set_name(sim, old_name)
+            # wait for gsettings
             sleep(1)
 
-    def test_changing_sim2_name(self):
+    def test_change_sim2_name(self):
         gsettings = Gio.Settings.new('com.ubuntu.phone')
-        old_name = gsettings.get_value('sim-names')['/ril_1']
+        sim = '/ril_1'
+
+        try:
+            old_name = gsettings.get_value('sim-names')[sim]
+        except:
+            old_name = 'SIM 2'
+
         new_name = 'BAR BAZ'
-        self.rename_sim(2, new_name)
+        self.cellular_page.set_name(sim, new_name)
 
-        # wait for gsettings
-        sleep(1)
         try:
-            self.assertEqual(
-                new_name, gsettings.get_value('sim-names')['/ril_1'])
+            self.assertThat(
+                lambda: gsettings.get_value('sim-names')[sim],
+                Eventually(Equals(new_name)))
         except Exception as e:
             raise e
         finally:
-            self.rename_sim(2, old_name)
+            self.cellular_page.set_name(sim, old_name)
             # wait for gsettings
             sleep(1)
 
-    def test_changes_to_sim_names_in_gsettings_are_reflected_in_ui(self):
+    def test_remote_manipulation_of_name(self):
         gsettings = Gio.Settings.new('com.ubuntu.phone')
         old_names = gsettings.get_value('sim-names')
-
+        sim = '/ril_0'
+        name = 'BAS QUX'
         new_names = old_names.unpack()
-        new_names['/ril_0'] = 'BAS QUX'
+        new_names[sim] = name
         new_names = GLib.Variant('a{ss}', new_names)
         gsettings.set_value('sim-names', new_names)
-
-        # wait for gsettings
-        sleep(1)
         try:
-            self.assertIn(new_names['/ril_0'], self.get_sim_name(1))
+            self.assertThat(
+                lambda: self.cellular_page.get_name(sim),
+                Eventually(StartsWith(name)))
         except Exception as e:
             raise e
         finally:
@@ -543,6 +223,36 @@
             # wait for gsettings
             sleep(1)
 
+    def test_roaming_switch(self):
+        self.cellular_page.disable_datas()
+        # assert roaming_switch is disabled
+        self.assertThat(
+            lambda: self.cellular_page.enable_roaming(timeout=1),
+            raises(AssertionError)
+        )
+
+    def test_allow_roaming_sim_1(self):
+        sim = '/ril_0'
+        self.cellular_page.select_sim_for_data(sim)
+
+        self.assertEqual(
+            False, self.modem_0.Get(CONNMAN_IFACE, 'RoamingAllowed'))
+        self.cellular_page.enable_roaming()
+        self.assertThat(
+            lambda: self.modem_0.Get(CONNMAN_IFACE, 'RoamingAllowed'),
+            Eventually(Equals(True)))
+
+    def test_allow_roaming_sim_2(self):
+        sim = '/ril_1'
+        self.cellular_page.select_sim_for_data(sim)
+
+        self.assertEqual(
+            False, self.modem_1.Get(CONNMAN_IFACE, 'RoamingAllowed'))
+        self.cellular_page.enable_roaming()
+        self.assertThat(
+            lambda: self.modem_1.Get(CONNMAN_IFACE, 'RoamingAllowed'),
+            Eventually(Equals(True)))
+
     def test_changing_default_sim_for_calls(self):
         gsettings = Gio.Settings.new('com.ubuntu.phone')
         default = gsettings.get_value('default-sim-for-calls')
@@ -556,11 +266,10 @@
         # click first sim
         self.system_settings.main_view.scroll_to_and_click(
             self.get_default_sim_for_calls_selector('/ril_0'))
-        # wait for gsettings
-        sleep(1)
-        self.assertEqual(
-            gsettings.get_value('default-sim-for-calls').get_string(),
-            '/ril_0')
+
+        self.assertThat(
+            lambda: gsettings.get_value('default-sim-for-calls').get_string(),
+            Eventually(Equals('/ril_0')))
 
     def test_changing_default_sim_for_messages(self):
         gsettings = Gio.Settings.new('com.ubuntu.phone')
@@ -574,108 +283,8 @@
         # click second sim
         self.system_settings.main_view.scroll_to_and_click(
             self.get_default_sim_for_messages_selector('/ril_1'))
-        # wait for gsettings
-        sleep(1)
-        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))
-
-    # regression test for 1375832
-    # tests that the second slot only exposes gsm, which
-    # the testdata indicates
-    def test_slot_two(self):
-        self.modem_0.EmitSignal(
-            SIM_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['Present', 'False'])
-        self.select_preference(PREFERENCE_2G)
-        self.assertRaises(StateNotFoundError,
-                          self.select_preference, PREFERENCE_UMTS)
+
+        self.assertThat(
+            lambda:
+                gsettings.get_value('default-sim-for-messages').get_string(),
+            Eventually(Equals('/ril_1')))
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_wifi.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2014-09-26 12:52:31 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2014-11-07 22:38:03 +0000
@@ -25,6 +25,11 @@
             Equals(_('Wi-Fi')))
 
     def test_connect_to_hidden_network(self):
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'yeah',
             scroll_to_and_click=self.system_settings.main_view
@@ -47,7 +52,11 @@
             dialog.wait_until_destroyed()
 
     def test_connect_to_nonexistant_hidden_network(self):
-
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'yeah',
             scroll_to_and_click=self.system_settings.main_view
@@ -72,6 +81,11 @@
 
     @skip('skipped due to bug 1337556')
     def test_connect_to_hidden_network_using_secrets(self):
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'yeah', security='wpa', password='abcdefgh',
             scroll_to_and_click=self.system_settings.main_view
@@ -95,6 +109,11 @@
 
     @skip('skipped due to bug 1337556')
     def test_connect_to_hidden_network_using_incorrect_secrets(self):
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'yeah', security='wpa', password='abcdefgh',
             scroll_to_and_click=self.system_settings.main_view
@@ -117,7 +136,11 @@
                 _('Your authentication details were incorrect'))))
 
     def test_connect_to_hidden_network_then_cancel(self):
-
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'foo',
             scroll_to_and_click=self.system_settings.main_view
@@ -134,6 +157,18 @@
                 len(self.device_mock.GetMethodCalls('Disconnect')),
             Eventually(Equals(1)))
 
+    def test_connect_to_hidden_network_dialog_visibility(self):
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.disable_wireless()
+        self.assertThat(
+            lambda: bool(self.wifi_page.select_single(
+                '*',
+                objectName='connectToHiddenNetwork').visible),
+            Eventually(Equals(False)), 'other net dialog not hidden')
+
     """Note: this test does not actually remove previous networks from the UI.
     The NetworkManager dbusmock template does not currently support deletion
     of connections."""
@@ -157,5 +192,7 @@
 
         self.system_settings.main_view.go_back()
 
+        # wait for ui to update
+        sleep(2)
         self.wifi_page.remove_previous_network(
             previous_networks[2]['ssid'], scroll_to_and_click=click_method)
 
=== modified file 'wizard/Utils/system.cpp'
--- wizard/Utils/system.cpp	2014-09-22 15:21:10 +0000
+++ wizard/Utils/system.cpp	2014-11-07 22:38:03 +0000
@@ -20,6 +20,7 @@
 #include <QDBusInterface>
 #include <QDBusPendingCall>
 #include <QDBusPendingReply>
+#include <QFile>
 #include <QProcess>
 #include <unistd.h>
 
@@ -81,11 +82,14 @@
 void System::getHereLicensePathFinished(QDBusPendingCallWatcher *watcher)
 {
     QDBusPendingReply<QVariant> reply = *watcher;
+
+    m_hereLicensePath = "";
+
     if (!reply.isError()) {
         QVariant value = reply.argumentAt<0>();
-        m_hereLicensePath = value.toString();
-    } else {
-        m_hereLicensePath = "";
+        if (QFile::exists(value.toString())) {
+            m_hereLicensePath = value.toString();
+        }
     }
 
     Q_EMIT hereLicensePathChanged();
 
=== modified file 'wizard/qml/Components/CheckableSetting.qml'
--- wizard/qml/Components/CheckableSetting.qml	2014-08-21 14:50:29 +0000
+++ wizard/qml/Components/CheckableSetting.qml	2014-11-07 22:38:03 +0000
@@ -27,9 +27,11 @@
     property real leftMargin
     property real rightMargin
 
+    readonly property real labelOffset: label.x
+
     signal linkActivated(string link)
 
-    implicitHeight: label.height + units.gu(2)
+    implicitHeight: Math.max(label.height, checkBox.height)
 
     Item {
         anchors.fill: parent
@@ -39,7 +41,7 @@
 
             anchors {
                 left: parent.left
-                verticalCenter: parent.verticalCenter
+                top: parent.top
                 leftMargin: listItem.leftMargin
             }
 
@@ -59,7 +61,10 @@
 
             Connections {
                 target: listItem.__mouseArea
-                onClicked: listItem.checked = !listItem.checked
+                onClicked: {
+                    listItem.checked = !listItem.checked
+                    listItem.triggered(listItem.checked)
+                }
             }
         }
 
 
=== modified file 'wizard/qml/Pages/30-passwd-type.qml'
--- wizard/qml/Pages/30-passwd-type.qml	2014-10-31 15:48:14 +0000
+++ wizard/qml/Pages/30-passwd-type.qml	2014-11-07 22:38:03 +0000
@@ -93,7 +93,7 @@
                         desc = i18n.tr("No security")
                     } else if (method === UbuntuSecurityPrivacyPanel.Passcode) {
                         name = i18n.tr("Passcode")
-                        desc = i18n.tr("4 numbers")
+                        desc = i18n.tr("4 digits only")
                     } else {
                         name = i18n.tr("Passphrase")
                         desc = i18n.tr("Numbers and letters")
 
=== modified file 'wizard/qml/Pages/50-location.qml'
--- wizard/qml/Pages/50-location.qml	2014-10-22 15:35:00 +0000
+++ wizard/qml/Pages/50-location.qml	2014-11-07 22:38:03 +0000
@@ -25,7 +25,15 @@
     title: i18n.tr("Location")
     forwardButtonSourceComponent: forwardButton
 
-    property bool hereInstalled: System.hereLicensePath !== "" && termsModel.count > 0
+    property bool pathSet: System.hereLicensePath !== " " // single space means it's unassigned
+    property bool countSet: false
+    skipValid: pathSet && (System.hereLicensePath === "" || countSet)
+    skip: skipValid && (System.hereLicensePath === "" || termsModel.count === 0)
+
+    Connections {
+        target: termsModel
+        onCountChanged: if (pathSet) countSet = true
+    }
 
     FolderListModel {
         id: termsModel
@@ -40,13 +48,15 @@
         busType: QMenuModel.DBus.SessionBus
         busName: "com.canonical.indicator.location"
         objectPath: "/com/canonical/indicator/location"
-        property variant enabled: action("location-detection-enabled")
+        property variant location: action("location-detection-enabled")
+        property variant gps: action("gps-detection-enabled")
         Component.onCompleted: start()
     }
 
     Column {
         id: column
         anchors.fill: content
+<<<<<<< TREE
         spacing: units.gu(2)
 
         Label {
@@ -83,6 +93,73 @@
             visible: hereInstalled
             wrapMode: Text.Wrap