Merge lp:~rsalveti/ubuntu-system-settings/agent-rework-rtm into lp:ubuntu-system-settings

[Ricardo Salveti]

Make an adapter-wide agent available for pairing requests initiated from a remote device. (LP: #1366061)

Make an adapter-wide agent available for pairing requests initiated from a remote device. (LP: #1366061)

Backport of: https://code.launchpad.net/~mathieu-tl/ubuntu-system-settings/agent-rework/+merge/250889

Unmerged revisions

998. By Ricardo Salveti on 2015-02-27

Register an agent on the adapter as well

997. By CI Train Bot Account on 2015-02-19

Releasing 0.3+15.04.20150219~rtm-0ubuntu1

996. By Michael Terry on 2015-02-19

Wait for libqofono to finish initializing before we decide whether to skip the wizard's SIM page or not.

libqofono recently became asynchronous, which the wizard was not prepared for. Fixes: #1423565
Approved by: Jonas G. Drange

995. By CI Train Bot Account on 2015-02-18

Releasing 0.3+15.04.20150218.1~rtm-0ubuntu1

994. By Ken VanDine on 2015-02-18

Removed conflicting ConnectivityMixin to fix smoke testing
 Fixes: #1423205
Approved by: Jonas G. Drange

993. By CI Train Bot Account on 2015-02-18

Releasing 0.3+15.04.20150218~rtm-0ubuntu1

992. By Mathieu Trudel-Lapierre on 2015-02-18

Use the address instead of name in main device list if name isn't available.
Approved by: Ken VanDine

991. By CI Train Bot Account on 2015-02-17

Releasing 0.3+15.04.20150217~rtm-0ubuntu1

990. By Jonas G. Drange on 2015-02-17

[cellular] makes the apn editor somewhat compatible to libqofono 0.7 Fixes: #1379850

989. By Jonas G. Drange on 2015-02-17

[cellular] using libqofono-0.7 and including functionality for enabling users to change what modem has 3G Fixes: #1379850

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-11-19 18:05:48 +0000
+++ CMakeLists.txt	2015-02-27 05:54:50 +0000
@@ -77,16 +77,30 @@
 add_subdirectory(plugins)
 add_subdirectory(src)
 add_subdirectory(tests)
-
-configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in @ONLY)
-add_custom_target(${DESKTOP_FILE} ALL
-                  COMMENT "Merging translations into ${DESKTOP_FILE}"
-                  COMMAND ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po
-                          ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in ${DESKTOP_FILE})
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
-
+<<<<<<< TREE
+
+configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in @ONLY)
+add_custom_target(${DESKTOP_FILE} ALL
+                  COMMENT "Merging translations into ${DESKTOP_FILE}"
+                  COMMAND ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po
+                          ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in ${DESKTOP_FILE})
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+
+=======
+add_subdirectory(wizard)
+
+configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in @ONLY)
+add_custom_target(${DESKTOP_FILE} ALL
+                  COMMENT "Merging translations into ${DESKTOP_FILE}"
+                  COMMAND ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po
+                          ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in ${DESKTOP_FILE})
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+
+>>>>>>> MERGE-SOURCE
 install(FILES ubuntu-system-settings.url-dispatcher DESTINATION share/url-dispatcher/urls)
 install(FILES screenshot.png DESTINATION ${SETTINGS_SHARE_DIR})
 install(FILES system-settings.png DESTINATION ${SETTINGS_SHARE_DIR})

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-23 19:58:56 +0000
+++ debian/changelog	2015-02-27 05:54:50 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ubuntu-system-settings (0.3+15.04.20150223-0ubuntu1) vivid; urgency=medium
 
   [ Leo Arias ]
@@ -1178,6 +1179,954 @@
 
  -- Ubuntu daily release <[e-mail]>  Fri, 15 Aug 2014 16:45:51 +0000
 
+=======
+ubuntu-system-settings (0.3+15.04.20150219~rtm-0ubuntu1) 14.09; urgency=medium
+
+  [ Michael Terry ]
+  * Wait for libqofono to finish initializing before we decide whether
+    to skip the wizard's SIM page or not.
+
+ -- CI Train Bot <[e-mail]>  Thu, 19 Feb 2015 17:21:09 +0000
+
+ubuntu-system-settings (0.3+15.04.20150218.1~rtm-0ubuntu1) 14.09; urgency=medium
+
+  [ Ken VanDine ]
+  * Removed conflicting ConnectivityMixin to fix smoke testing (LP:
+    #1423205)
+
+ -- CI Train Bot <[e-mail]>  Wed, 18 Feb 2015 18:07:18 +0000
+
+ubuntu-system-settings (0.3+15.04.20150218~rtm-0ubuntu1) 14.09; urgency=medium
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ Mathieu Trudel-Lapierre ]
+  * Use the address instead of name in main device list if name isn't
+    available.
+
+ -- CI Train Bot <[e-mail]>  Wed, 18 Feb 2015 15:12:33 +0000
+
+ubuntu-system-settings (0.3+15.04.20150217~rtm-0ubuntu1) 14.09; urgency=medium
+
+  [ CI Train Bot ]
+  * Resync trunk
+  * Resync trunk
+  * Resync trunk
+  * Resync trunk
+  * Resync trunk
+  * Resync trunk
+  * Resync trunk
+  * Resync trunk
+  * Resync trunk
+
+  [ jonas-drange ]
+  * [cellular] using libqofono-0.7 and including functionality for
+    enabling users to change what modem has 3G (LP: #1379850)
+  * [cellular] makes the apn editor somewhat compatible to libqofono 0.7
+    (LP: #1379850)
+
+ -- CI Train Bot <[e-mail]>  Tue, 17 Feb 2015 12:55:31 +0000
+
+ubuntu-system-settings (0.3+15.04.20150204.1~rtm-0ubuntu1) 14.09; urgency=medium
+
+  [ jonas-drange ]
+  * [sound] let user toggle other vibrate setting
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 04 Feb 2015 15:19:16 +0000
+
+ubuntu-system-settings (0.3+15.04.20150204~rtm-0ubuntu1) 14.09; urgency=medium
+
+  [ Ken VanDine ]
+  * Revoke any cached authorizations before trying to change password
+    mode. This makes sure that we authenticate the user again even if we
+    just did so (for UX consistency).
+  * [about] properly display IMEI values for no devices ("None"), one
+    device and multiple devices. Remove test now redundant. (LP:
+    #1205294)
+  * [security/privacy] add connectivity binding and let user unlock a
+    given SIM (LP: #1378883)
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 04 Feb 2015 17:38:10 +0000
+
+ubuntu-system-settings (0.3+15.04.20150203.1~rtm-0ubuntu1) 14.09; urgency=medium
+
+  [ Ken VanDine ]
+  * initialize m_lastFullCharge as NULL
+  * Use device-state from indicator-power to determine charging status.
+    QtSystemsInfo doesn't support UPower 0.99. (LP: #1416096)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 03 Feb 2015 16:08:56 +0000
+
+ubuntu-system-settings (0.3+15.04.20150128.1~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Alberto Mardegan ]
+  * Security: ignore older requests when building the applications'
+    grants
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 28 Jan 2015 09:56:05 +0000
+
+ubuntu-system-settings (0.3+15.04.20150123.1~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Andrea Cimitan ]
+  * Fix continue button in wifi wizard page, adds qml-module-
+    qtsysteminfo as ubuntu-system-settings-wizard dep (LP: #1363400)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 23 Jan 2015 18:19:35 +0000
+
+ubuntu-system-settings (0.3+15.04.20150123~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Ken VanDine ]
+  * [brightness] ensure properties are not use undefined (LP: #1385467)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 23 Jan 2015 14:54:16 +0000
+
+ubuntu-system-settings (0.3+15.04.20150122~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Ken VanDine ]
+  * [cellular/carriers] new Carrier & APN entry, as well as a major
+    refactor of carrier selection code warranted by the design change.
+    (LP: #1388044)
+  * [bluetooth] Show bluetooth address instead of name while it's not
+    detected; to be updated once available. (LP: #1382767)
+
+  [ jonas-drange ]
+  * Make currently active connection forgettable.
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 22 Jan 2015 01:39:48 +0000
+
+ubuntu-system-settings (0.3+15.04.20150120~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Manuel de la Peña ]
+  * Fix click downloads pause by ensuring that the settings works
+    accordingly. (LP: #1398310)
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Manuel de la Pena ]
+  * Fix click downloads pause by ensuring that the settings works
+    accordingly. (LP: #1398310)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 20 Jan 2015 15:04:46 +0000
+
+ubuntu-system-settings (0.3+15.04.20150114.1~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Ken VanDine ]
+  * Added missing depends for qml-module-ubuntu-connectivity (LP:
+    #1410968)
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 14 Jan 2015 21:01:31 +0000
+
+ubuntu-system-settings (0.3+15.04.20150114~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Ken VanDine ]
+  * Tiny step towards improved use of the preferred page-object model,
+    hopefully making some tests more reliable. (LP: #1409809)
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 14 Jan 2015 02:51:38 +0000
+
+ubuntu-system-settings (0.3+15.04.20150112~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Ken VanDine ]
+  * [security] replace inputmask for validator and maximum length (LP:
+    #1357548)
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 12 Jan 2015 21:51:55 +0000
+
+ubuntu-system-settings (0.3+15.04.20150109~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ jonas-drange ]
+  * [about] use networkinfo to pull the wifi device MAC (LP: #1399723)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 09 Jan 2015 14:45:20 +0000
+
+ubuntu-system-settings (0.3+15.04.20150107~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Ken VanDine ]
+  * [about] use SingleValueStacked for all information bits in the
+    version panel
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 07 Jan 2015 15:07:19 +0000
+
+ubuntu-system-settings (0.3+15.04.20150106~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Ken VanDine ]
+  * [system-update] remember the latest SystemUpdate downloaded and
+    compare the version when checking again and set updateReady
+    appropriately. This fixes the handling of downloaded updates when
+    auto-download is false. (LP: #1392051)
+  * [orientation] String change to Rotation Lock
+
+  [ Ted Gould ]
+  * Make silent mode use the action state in the sound user service (LP:
+    #1382089, #1388804, #1395709)
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 06 Jan 2015 21:41:04 +0000
+
+ubuntu-system-settings (0.3+15.04.20141211~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Ken VanDine ]
+  * [cellular] split "Cellular Data" and "Connection type" into two
+    separate pieces in the UI for both single and multi SIM (LP:
+    #1378812, #1377455)
+
+  [ jonas-drange ]
+  * [cellular] Use a repeater to lay out two separate ItemSelectors for
+    modems, making sure it works well between connMan power cycles (LP:
+    #1377455)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 11 Dec 2014 14:24:35 +0000
+
+ubuntu-system-settings (0.3+15.04.20141210~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Ken VanDine ]
+  * Support UPower 0.99 (LP: #1337200, #1390629)
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 10 Dec 2014 23:53:31 +0000
+
+ubuntu-system-settings (0.3+15.04.20141209~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Ken VanDine ]
+  * [battery] don't control wifi state with libnm, use the
+    QDBusActionGroup from indicator-network (LP: #1391940)
+  * Update the translations template during the build (LP: #1399212)
+  * Use the SliderMenu component instead of the Slider component to
+    fixed value binding issues
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 09 Dec 2014 14:16:59 +0000
+
+ubuntu-system-settings (0.3+15.04.20141202~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Ken VanDine ]
+  * Refreshed ubuntu-system-settings.pot
+
+  [ Michael Terry ]
+  * When the power button is held down, show the shutdown dialog like we
+    do in the unity8 shell. (LP: #1381731)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 02 Dec 2014 19:41:37 +0000
+
+ubuntu-system-settings (0.3+15.04.20141112.1~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Ken VanDine ]
+  * Backport fix for Switch/Check binding (LP: #1336715) (LP: #1336715)
+
+  [ 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.
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 12 Nov 2014 16:28:25 +0000
+
+ubuntu-system-settings (0.3+14.10.20141104~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Ken VanDine ]
+  * [battery] don't use a colored icon (LP: #1351383)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 04 Nov 2014 14:38:52 +0000
+
+ubuntu-system-settings (0.3+14.10.20141103~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Michael Terry ]
+  * Add a Continue button when choosing a passphrase. And fix a few
+    other design nits with choosing a password.
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 03 Nov 2014 19:58:15 +0000
+
+ubuntu-system-settings (0.3+14.10.20141029~rtm-0ubuntu1) 14.09; 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)
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 29 Oct 2014 13:31:03 +0000
+
+ubuntu-system-settings (0.3+14.10.20141028~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Ken VanDine ]
+  * Fix a typo in the HERE terms link.
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 28 Oct 2014 14:50:00 +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
+
+ubuntu-system-settings (0.3+14.10.20141021-0ubuntu1) utopic; urgency=low
+
+  [ jonas-drange ]
+  * [security/privacy] allow user to change HERE and location detection
+    settings. (LP: #1375322)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 21 Oct 2014 13:23:03 +0000
+
+ubuntu-system-settings (0.3+14.10.20141017~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Ken VanDine ]
+  * Updated the pot file.
+
+  [ jonas-drange ]
+  * [cellular] indirectly recreate ConnectionManager interface's dbus
+    proxy so it reports the true value of 'Powered' after flight mode
+    (LP: #1376957)
+
+  [ Iain Lane ]
+  * [sound] Make listSounds take a list of directories and list all of
+    the files in them, instead of assuming "/custom" all the time.
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Sebastien Bacher ]
+  * [sound] list custom ringtones as well (LP: #1381528)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 17 Oct 2014 14:57:51 +0000
+
+ubuntu-system-settings (0.3+14.10.20141014-0ubuntu1) utopic; urgency=low
+
+  [ Ken VanDine ]
+  * Add an APN editor. (LP: #1225174)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 14 Oct 2014 07:52:12 +0000
+
+ubuntu-system-settings (0.3+14.10.20141010-0ubuntu1) utopic; urgency=low
+
+  [ Michael Terry ]
+  * Complete the unlock security screens and update a host of other
+    small design issues. (LP: #1365034, LP: #1348362) (LP: #1365034,
+    #1348362)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 10 Oct 2014 18:02:19 +0000
+
+ubuntu-system-settings (0.3+14.10.20141009-0ubuntu1) utopic; urgency=low
+
+  [ Diego Sarmentero ]
+  * Improves in network backend. Detect network connection and show
+    "Connect to the internet..." message or retry on netword detected. .
+  * Detect account added on online accounts (LP: #1362149)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 09 Oct 2014 15:09:57 +0000
+
+ubuntu-system-settings (0.3+14.10.20141007-0ubuntu1) utopic; urgency=low
+
+  [ jonas-drange ]
+  * [wifi/phone] dynamically chooses what SIM to use when there's only
+    one present. (LP: #1375832)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 07 Oct 2014 18:21:03 +0000
+
+ubuntu-system-settings (0.3+14.10.20141003-0ubuntu1) utopic; urgency=low
+
+  [ Iain Lane ]
+  * [storage/about] Use a QSharedPointer to manage freeing of the
+    counter which we use to display all of the collected sizes at once.
+    If the measuring process was cancelled, we were freeing it multiple
+    times - once for each outstanding size measurement. This led to a
+    crash. (LP: #1375988)
+  * [security-privacy] Link with gobject, uses symbols from this
+    library. Prevents "[…]libUbuntuSecurityPrivacyPanel.so contains an
+    unresolvable reference to symbol
+    g_signal_handlers_disconnect_matched: it's probably a plugin"
+    warnings.
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 03 Oct 2014 13:52:42 +0000
+
+ubuntu-system-settings (0.3+14.10.20141002-0ubuntu1) utopic; urgency=low
+
+  [ jonas-drange ]
+  * [cellular] react to application.state changes and update potential
+    out-of-date default SIM settings (LP: #1364103)
+  * [wifi] let removed networks update the previous network model so
+    that we can reuse the model (and not pop the pagestack twice,
+    causing this ux issue) (LP: #1370389)
+
+  [ Sebastien Bacher ]
+  * [location] use a flickable so the list can be scrolled (LP:
+    #1374017)
+  * [security] get localized application names from the trust-store (LP:
+    #1374018)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 02 Oct 2014 14:05:35 +0000
+
+ubuntu-system-settings (0.3+14.10.20141001-0ubuntu1) utopic; urgency=low
+
+  [ Ken VanDine ]
+  * Fixed handling of the Downloading/Installing label based on actual
+    state. . Forward updateProgress signals for system updates. Layout
+    fixes (LP: #1312587)
+  * Use new splash screen (LP: #1376242)
+  * Improved tracking download states
+  * Use new target_build_number from system-image-dbus to determine
+    visibility of the update notification (LP: #1355803)
+
+  [ CI bot ]
+  * Resync trunk
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 01 Oct 2014 16:01:54 +0000
+
+ubuntu-system-settings (0.3+14.10.20140926-0ubuntu1) utopic; urgency=low
+
+  [ Sebastien Bacher ]
+  * [storage] use libclick rather than calling the command line (LP:
+    #1368967)
+  * [storage] tweaks to the disk informations, limit the free space to
+    the user available one (excluding the system partitions), don't list
+    the external mounts, that's described in the design and is going to
+    require work on the categories computation to give correct values
+    (LP: #1284247)
+  * [about] display the free space value next to the storage label (LP:
+    #1335144)
+
+  [ Albert Astals ]
+  * Add i18n.tr
+
+  [ jonas-drange ]
+  * [wifi] connect to hidden network is now a dialog (LP: #1366005)
+
+  [ Ken VanDine ]
+  * Provide more keywords to make search useful (LP: #1370219) (LP:
+    #1370219)
+  * [background] set sourceSize in the image preview to work around an
+    issue loading large images (LP: #1373462)
+
+  [ CI bot ]
+  * Resync trunk
+
+  [ Mathieu Trudel-Lapierre ]
+  * [bluetooth] Properly handle device types for connection and
+    disconnection. (LP: #1369964)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 26 Sep 2014 15:32:57 +0000
+
+ubuntu-system-settings (0.3+14.10.20140925-0ubuntu1) utopic; urgency=low
+
+  [ Michael Terry ]
+  * Add a translator comment for what HERE means. (LP: #1368838) (LP:
+    #1368838)
+  * Prevent a crash in unity8 when the wizard also crashes or stops
+    early. (LP: #1355892) (LP: #1355892)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 25 Sep 2014 00:22:52 +0000
+
+ubuntu-system-settings (0.3+14.10.20140924.1-0ubuntu1) utopic; urgency=low
+
+  [ Michael Terry ]
+  * Prevent the buttons of the wizard's password page from overlapping
+    its content when the OSK appears. (LP: #1368346) (LP: #1368346)
+
+  [ Ken VanDine ]
+  * Set the version information in the SystemUpdate constructor (LP:
+    #1371810) (LP: #1371810)
+  * [reset] Don't bail out on an isValid() check on the SystemImage
+    QDBusInterface, the docs say isValid() may not be reliable for
+    remote interfaces (LP: #1370815) (LP: #1370815)
+  * Fixed reference error for count on the various device models (LP:
+    #1362517) (LP: #1362517)
+  * [background] Use the ContentPeerPicker to select sources for
+    backgrounds (LP: #1356542) (LP: #1356542)
+
+  [ Iain Lane ]
+  * Don't check if the timedated interface is valid before calling
+    SetTime on it, it might have timed out and we should reactivate it
+    in that case.
+  * [about] Fix developerMode property to be QMLish - read & write
+    instead of separate "read" and "toggle" properties.
+  * [about] Don't display a frame for icons that can't be found,
+    improving the visual appearance. Also return the correct path for
+    click packages which use the icon theme.
+
+  [ Sebastien Bacher ]
+  * [storage] handle the scope click .ini and get the correct icons (LP:
+    #1368920)
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 24 Sep 2014 16:47:25 +0000
+
+ubuntu-system-settings (0.3+14.10.20140924-0ubuntu1) utopic; urgency=low
+
+  [ Albert Astals ]
+  * make pot
+
+  [ Oliver Grawert ]
+  * fix LP: #1365903, add a watch to Developer Mode page so the page
+    gets refreshed when going back through the page stack, also fix the
+    page id and bounds (LP: #1365903)
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 24 Sep 2014 11:10:54 +0000
+
+ubuntu-system-settings (0.3+14.10.20140917.1-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Some packaging fixes
+    - > is not a valid relationship. It should be >>
+    - Don't recommend suru-icon-theme since we also depend on it
+    - Bump S-V to 3.9.6 which for example allows the images we ship in
+      /usr/lib/
+    - Override binary-no-manpage lintian warnings. We're not going to get man
+      pages for u-s-s any time soon
+
+ -- Iain Lane <[e-mail]>  Wed, 24 Sep 2014 12:12:26 +0100
+
+ubuntu-system-settings (0.3+14.10.20140917.1-0ubuntu1) utopic; urgency=low
+
+  [ Ken VanDine ]
+  * Make UpdateManager a singleton and refresh the availableUpdates
+    count when the model updates (LP: #1325629) (LP: #1325629)
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 17 Sep 2014 14:04:04 +0000
+
+ubuntu-system-settings (0.3+14.10.20140917-0ubuntu1) utopic; urgency=low
+
+  [ Ken VanDine ]
+  * Include an icon instead of using the themed icon (LP: #1365408) (LP:
+    #1365408)
+
+  [ Mathieu Trudel-Lapierre ]
+  * [bluetooth] don't try to enable Discoverable if the device isn't
+    powered yet. (LP: #1355904)
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 17 Sep 2014 02:19:38 +0000
+
+ubuntu-system-settings (0.3+14.10.20140915.1-0ubuntu1) utopic; urgency=low
+
+  [ Ken VanDine ]
+  * When activated by a url request for a specific panel, clear the
+    pageStack to maintain the natural navigation instead of pushing a
+    new page on top of a page from a the previous panel (LP: #1362025)
+    (LP: #1362025, #1359953)
+
+  [ Lars Uebernickel ]
+  * Use Icon instead of StatusIcon
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 15 Sep 2014 23:26:16 +0000
+
+ubuntu-system-settings (0.3+14.10.20140915-0ubuntu1) utopic; urgency=low
+
+  [ CI bot ]
+  * Resync trunk
+
+  [ John R. Lenton ]
+  * Take the system settings push helper closer to implementing the spec
+    at https://wiki.ubuntu.com/SoftwareUpdates#Prompting (LP: #1363972)
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 15 Sep 2014 13:54:48 +0000
+
+ubuntu-system-settings (0.3+14.10.20140913-0ubuntu1) utopic; urgency=low
+
+  [ Ken VanDine ]
+  * Don't try to tweak the bottomMargin for the OSK, it was trying to
+    calculate it based on an undefined component so failing. It
+    shouldn't be needed anyway.
+
+ -- Ubuntu daily release <[e-mail]>  Sat, 13 Sep 2014 02:46:25 +0000
+
+ubuntu-system-settings (0.3+14.10.20140912-0ubuntu1) utopic; urgency=low
+
+  [ jonas-drange ]
+  * [wifi] "Other Network" -> "Connect to hidden network" (LP: #1365984)
+  * [wifi] fix bad looking buttons in "Other Networks" panel (LP:
+    #1362127)
+
+  [ Jussi Pakkanen ]
+  * Hide entry to connect to hidden network when wifi is off. (LP:
+    #1365960)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 12 Sep 2014 20:43:55 +0000
+
+ubuntu-system-settings (0.3+14.10.20140911.3-0ubuntu1) utopic; urgency=low
+
+  [ Ken VanDine ]
+  * Fixed tests for the dialpad settings failing on mako
+  * Don't call downloadUpdate when we see a system update ready, the
+    service does that for us (LP: #1368294) (LP: #1368294)
+  * Translate desktop file (LP: #1318008) (LP: #1318008)
+
+  [ Martin Pitt ]
+  * update POT
+
+  [ Sebastien Bacher ]
+  * [system-update] open the ubuntuone subpanel rather than the list
+    (LP: #1348580)
+  * [security-privacy] use ngettext strings when needed (LP: #1368159)
+  * Increase vertical spacing in the settings grid (LP: #1348579)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 11 Sep 2014 21:08:06 +0000
+
+ubuntu-system-settings (0.3+14.10.20140911.1-0ubuntu1) utopic; urgency=low
+
+  [ jonas-drange ]
+  * [background] always keep custom images, and remove press-and-hold
+    action. (LP: #1365167)
+  * [wifi] do not use predictive text for network name input (LP:
+    #1365992)
+  * [language] workaround for transition bug in keyboard layout menu
+    (LP: #1350809)
+  * [wifi] factory was setting the icon property, which was causing the
+    icon to not render (LP: #1364366)
+
+  [ Alejandro J. Cura ]
+  * Fixing the refreshing of the apps scope (LP: #1360369)
+
+  [ Sebastien Bacher ]
+  * [sound] use the correct backend to control the keyboard sound toggle
+    (LP: #1366208)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 11 Sep 2014 04:15:10 +0000
+
+ubuntu-system-settings (0.3+14.10.20140911-0ubuntu1) utopic; urgency=low
+
+  [ Ken VanDine ]
+  * Don't call downloadUpdate for system updates that are already
+    downloading (LP: #1365646) (LP: #1311219, #1365646)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 11 Sep 2014 00:42:18 +0000
+
+ubuntu-system-settings (0.3+14.10.20140909-0ubuntu1) utopic; urgency=low
+
+  [ Ken VanDine ]
+  * Notify the user if the phone needs to be plug to power for update.
+
+  [ Sebastien Bacher ]
+  * [system-update] don't draw a frame around ubuntu updates (LP:
+    #1367136)
+
+  [ Mathieu Trudel-Lapierre ]
+  * Also allow Speakers and Carkits as valid audio devices to pair.
+
+  [ Michael Terry ]
+  * Allow switch from PIN code to passphrase and back using the same
+    password. (LP: #1357043) (LP: #1357043)
+  * Fix false-negatives from AccountsService when switching from swipe
+    to password (LP: #1363405) (LP: #1363405)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 09 Sep 2014 16:40:09 +0000
+
+ubuntu-system-settings (0.3+14.10.20140908.1-0ubuntu1) utopic; urgency=low
+
+  [ Ricardo Salveti de Araujo ]
+  * sound: setting default audio role for ringtone and messages
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 08 Sep 2014 21:41:34 +0000
+
+ubuntu-system-settings (0.3+14.10.20140908-0ubuntu1) utopic; urgency=low
+
+  [ Michael Terry ]
+  * Don't crash when destructing the Wizard.Utils.System plugin. This
+    fixes the crash on wizard exit and the crash when pressing back on
+    the HERE license.
+
+  [ CI bot ]
+  * Resync trunk
+
+  [ Sebastien Bacher ]
+  * [developer-mode] working scrolling and correct spacing
+  * Use standard items for the categories and don't display dividers
+    (LP: #1365563)
+  * [orientation-lock] don't display a frame around the icon (LP:
+    #1365450)
+
+  [ jonas-drange ]
+  * [about/versions] create reusable component of singlevalue items that
+    have long values (LP: #1363927)
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 08 Sep 2014 14:58:34 +0000
+
+ubuntu-system-settings (0.3+14.10.20140905.1-0ubuntu1) utopic; urgency=low
+
+  [ David Barth ]
+  * Enable location panel, display contols for authorized applications.
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 05 Sep 2014 09:01:36 +0000
+
+ubuntu-system-settings (0.3+14.10.20140904.2-0ubuntu1) utopic; urgency=low
+
+  [ Ken VanDine ]
+  * Tweak the depends for accountsservice-ubuntu-schemas to handle a "~"
+    version
+
+  [ CI bot ]
+  * Resync trunk
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 04 Sep 2014 21:04:28 +0000
+
+ubuntu-system-settings (0.3+14.10.20140904.1-0ubuntu1) utopic; urgency=low
+
+  [ Guillermo Gonzalez ]
+  * Basic unittest for the push-helper script
+
+  [ Mathieu Trudel-Lapierre ]
+  * Downgrade qFatal failure to register bluetooth agent to a qCritical.
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 04 Sep 2014 04:39:47 +0000
+
+ubuntu-system-settings (0.3+14.10.20140904-0ubuntu1) utopic; urgency=low
+
+  [ Andrea Cimitan ]
+  * Various fixes for wifi wizard page (LP: #1362296)
+
+  [ Sebastien Bacher ]
+  * [security] don't mark "%1" string as translatable
+  * [security] give a translation context to the 'None' string (LP:
+    #1362143)
+  * [licenses] display an error when the copyright can't be read (LP:
+    #1206150)
+
+  [ Michael Terry ]
+  * Avoid another race condition when switching password types by
+    completing all DBus operations synchronously as we exit the
+    policykit agent. LP: 1361137 (LP: #1361137)
+  * Fix the OSK not working on first boot. When the wizard closes, shut
+    down maliit-server and the indicators so that unity8 can start them
+    itself. LP: 1362679 (LP: #1362679)
+
+  [ jonas-drange ]
+  * [about] print out phone numbers for dual sims as well
+  * [about/wifi] adding mac addresses for bt and wifi, and ip for wifi
+    (LP: #1356239)
+  * [language] explain to the user that a reboot is necessary for the
+    change to take effect (LP: #1240875)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 04 Sep 2014 00:59:05 +0000
+
+ubuntu-system-settings (0.3+14.10.20140902.2-0ubuntu1) utopic; urgency=low
+
+  [ Michael Terry ]
+  * Make the HERE license optional, clearly mark it as a HERE license
+    instead of an Ubuntu license, and connect it to the HERE backend.
+
+  [ CI bot ]
+  * Resync trunk
+
+  [ Martin Pitt ]
+  * POT update
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 02 Sep 2014 23:27:15 +0000
+
+ubuntu-system-settings (0.3+14.10.20140829.2-0ubuntu1) utopic; urgency=low
+
+  [ Ken VanDine ]
+  * Added setting for dialpad sounds to both the sound and phone panels.
+
+  [ CI bot ]
+  * Resync trunk
+
+  [ Diego Sarmentero ]
+  * Fix out of sync image download. Refresh scope after installation
+    (LP: #1324923)
+
+  [ Sebastien Bacher ]
+  * [battery] refresh the graph on a minute basis
+  * [notifications] use normal text style and ubuntushaped icons
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 29 Aug 2014 20:48:28 +0000
+
+ubuntu-system-settings (0.3+14.10.20140829.1-0ubuntu1) utopic; urgency=low
+
+  [ Michael Terry ]
+  * When changing to swipe mode, it was possible that our policykit
+    agent would not unregister itself, making the next attempt to change
+    modes appear to work, but in truth fail. Also, no longer ask for a
+    password to switch to swipe mode if policykit has a cached
+    authentication for us. (LP: #1350381)
+
+  [ Sebastien Bacher ]
+  * [security] tweak some pin locking details to match the design better
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 29 Aug 2014 05:19:18 +0000
+
+ubuntu-system-settings (0.3+14.10.20140828.3-0ubuntu1) utopic; urgency=low
+
+  [ Michael Terry ]
+  * Implement the "When locked, allow:" portion of the Security &
+    Privacy panel, so now the user can control whether the launcher
+    and/or indicators are available while locked. (LP: #1358340) (LP:
+    #1358340)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 28 Aug 2014 18:11:51 +0000
+
+ubuntu-system-settings (0.3+14.10.20140828.2-0ubuntu1) utopic; urgency=low
+
+  [ Michael Terry ]
+  * Update look and feel of wizard to more closely match the visual
+    design.
+
+  [ Jussi Pakkanen ]
+  * Minor cleanups.
+
+  [ Roberto Alsina ]
+  * Don't crash the push helper in locales that have no .mo file (LP:
+    #1357506)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 28 Aug 2014 13:55:40 +0000
+
+ubuntu-system-settings (0.3+14.10.20140827.3-0ubuntu1) utopic; urgency=low
+
+  [ Ken VanDine ]
+  * SIM PIN lock implementation
+
+  [ jonas-drange ]
+  * [main panel] add visual feedback on press
+  * [cellular] uses modemtechnologies property from ofono to populate
+    technology preference options (LP: #1346790)
+
+  [ Sebastien Bacher ]
+  * [language] workaround inconsistent languages casing (LP: #1362123)
+  * [background] Display the default background selected (LP: #1349329)
+  * [storage] display translated names (LP: #1360207)
+  * [updates] don't display animations when clicking on update rows (LP:
+    #1360364)
+  * [background] don't use an icon in the headerbar (LP: #1362122)
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 27 Aug 2014 22:19:17 +0000
+
+ubuntu-system-settings (0.3+14.10.20140827.1-0ubuntu1) utopic; urgency=low
+
+  [ Mathieu Trudel-Lapierre ]
+  * Fix PIN code or passcode requests by properly matching the tag for
+    the original request. (LP: #1355152)
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 27 Aug 2014 15:27:50 +0000
+
+ubuntu-system-settings (0.3+14.10.20140826.1-0ubuntu1) utopic; urgency=low
+
+  [ Martin Pitt ]
+  * Update PO template
+
+  [ Sebastien Bacher ]
+  * Include extra files for translations (LP: #1359267)
+
+  [ jonas-drange ]
+  * [main panel] show rotation lock, point to correct setting
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 26 Aug 2014 15:48:48 +0000
+
+ubuntu-system-settings (0.3+14.10.20140826-0ubuntu1) utopic; urgency=low
+
+  [ Ken VanDine ]
+  * Hide sleep locks immediately setting, which isn't implemented yet
+    (LP: #1361297) (LP: #1361297)
+
+  [ Sebastien Bacher ]
+  * [system-update] rework the ui to use a column rather than anchors,
+    the layout is quite dynamic and it should be easier to position and
+    stack widgets this way (LP: #1343172)
+
+  [ Michael Terry ]
+  * After selecting the language, update the session environment
+    immediately and restart indicators so that their notifications (like
+    wifi prompt) are translated. (LP: #1354325)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 26 Aug 2014 00:55:20 +0000
+
+ubuntu-system-settings (0.3+14.10.20140825-0ubuntu1) utopic; urgency=low
+
+  [ Ken VanDine ]
+  * Added autopilot tests for security-privacy
+
+  [ jonas-drange ]
+  * [phone] adding dual sim functionality to phone panel
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 25 Aug 2014 15:19:31 +0000
+
+ubuntu-system-settings (0.3+14.10.20140822.1-0ubuntu1) utopic; urgency=low
+
+  [ Charles Kerr ]
+  * In the welcome wizard, refresh the text in the 'no sim card' and
+    'all done' pages to match the latest from design.
+
+  [ Michael Terry ]
+  * Add a location page and a terms and conditions page for the HERE
+    service.
+
+  [ Ken VanDine ]
+  * Settings for idle/lock timeout (LP: #1230345)
+  * Added flickable to fix scrolling (LP: #1354161)
+
+  [ Jussi Pakkanen ]
+  * Fix a bunch of compiler warnings.
+
+  [ jonas-drange ]
+  * [cellular] displays cellular UIs based on how many SIMs are present.
+    (LP: #1357393)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 22 Aug 2014 18:57:00 +0000
+
+ubuntu-system-settings (0.3+14.10.20140819.1-0ubuntu1) utopic; urgency=low
+
+  [ Sebastien Bacher ]
+  * [system-updates] set flickable to null, workaround an issue with the
+    page widget (the panel opens with a listview on top, which the page
+    use, but then a button is added between those and that's not well
+    handled) (LP: #1356292)
+
+  [ Leo Arias ]
+  * Made the wizard security options translatable. (LP: #1357605)
+
+  [ jonas-drange ]
+  * [cellular] fix bug where the ui reverts tech pref to 2G and where
+    ofono rejects 'any' (LP: #1355053)
+
+  [ Ken VanDine ]
+  * Disable predictive text for the SIM name editor, it isn't terribly
+    useful there and currently causes the field to get blocked when the
+    keyboard is raised.
+
+  [ Martin Pitt ]
+  * Mark for using language packs.
+
+  [ Alberto Mardegan ]
+  * Other App Access: get icon from click package Improve the logic for
+    retrieving the icon. (LP: #1356938)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 19 Aug 2014 15:26:55 +0000
+
+ubuntu-system-settings (0.3+14.10.20140815-0ubuntu1) utopic; urgency=low
+
+  [ Michael Terry ]
+  * Make the wizard properly handle devices with zero, one, or two SIM
+    modem slots. Previously it assumed exactly one slot. (LP: #1332583)
+
+  [ jonas-drange ]
+  * [main panel] point rotation lock at new backend and add (skipped)
+    tests (LP: #1288332)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 15 Aug 2014 16:45:51 +0000
+
+>>>>>>> MERGE-SOURCE
 ubuntu-system-settings (0.3+14.10.20140814.1-0ubuntu1) utopic; urgency=low
 
   [ CI bot ]

=== modified file 'debian/control'
--- debian/control	2015-02-17 15:32:54 +0000
+++ debian/control	2015-02-27 05:54:50 +0000
@@ -40,12 +40,16 @@
                pep8,
                python3-pep8,
                pyflakes,
+<<<<<<< TREE
                python3,
                python3-gi,
                python3-dbus,
                python3-xdg,
                gir1.2-glib-2.0
 Standards-Version: 3.9.6
+=======
+Standards-Version: 3.9.6
+>>>>>>> MERGE-SOURCE
 Homepage: https://launchpad.net/ubuntu-system-settings
 # If you aren't a member of ~system-settings-touch but need to upload packaging
 # changes, just go ahead.  ~system-settings-touch will notice and sync up the
@@ -71,12 +75,18 @@
          qmenumodel-qml,
          qtdeclarative5-folderlistmodel-plugin,
          qml-module-qtmultimedia | qml-module-qtmultimedia-gles,
+         qml-module-ubuntu-connectivity,
          qtdeclarative5-gsettings1.0 (>=0.1+14.10.20140801.1),
          qtdeclarative5-ofono0.2 (>=0.70~),
          qtdeclarative5-systeminfo-plugin,
          qtdeclarative5-ubuntu-content1,
+<<<<<<< TREE
          qtdeclarative5-ubuntu-settings-components (>> 0.2),
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1347) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1347),
+=======
+         qtdeclarative5-ubuntu-settings-components (>> 0.2),
+         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
+>>>>>>> MERGE-SOURCE
          suru-icon-theme,
          whoopsie-preferences (>= 0.9),
          libsystemsettings1 (= ${binary:Version}),
@@ -88,10 +98,15 @@
          python3,
          python3-gi,
          python3-dbus,
+<<<<<<< TREE
          python3-xdg,
          gir1.2-glib-2.0,
          qml-module-ubuntu-connectivity
 Recommends: ubuntu-system-settings-online-accounts,
+=======
+         gir1.2-glib-2.0
+Recommends: ubuntu-system-settings-online-accounts,
+>>>>>>> MERGE-SOURCE
             ubuntu-touch-sounds,
 Conflicts: ubuntu-system-settings-example
 # ubuntu-push-client shipped the system settings push helper until 0.60:
@@ -102,6 +117,23 @@
  Ubuntu Touch images, it's designed for phones, tablets and convergent
  devices.
 
+<<<<<<< TREE
+=======
+Package: ubuntu-system-settings-wizard
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         qml-module-qtsysteminfo,
+         ubuntu-system-settings (= ${binary:Version}),
+         unity8 (>= 8.01),
+Recommends: qtdeclarative5-qtmir-plugin (>= 0.4)
+Conflicts: ubuntu-system-settings (<< 0.3)
+Breaks: ubuntu-system-settings (<< 0.3)
+Description: Welcome Wizard for Ubuntu Touch
+ This package contains the Welcome Wizard used on the Ubuntu Touch images,
+ it's designed for phones, tablets and convergent devices.
+
+>>>>>>> MERGE-SOURCE
 Package: libsystemsettings1
 Section: libs
 Architecture: any

=== modified file 'plugins/about/PageComponent.qml'
--- plugins/about/PageComponent.qml	2015-02-23 10:08:30 +0000
+++ plugins/about/PageComponent.qml	2015-02-27 05:54:50 +0000
@@ -39,6 +39,10 @@
         id: backendInfos
     }
 
+    StorageInfo {
+        id: storageInfo
+    }
+
     DeviceInfo {
         id: deviceInfos
     }
@@ -164,8 +168,13 @@
                 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(Utilities.formatSize(backendInfos.getFreeSpace("/home")))
+=======
+                /* 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")))
+>>>>>>> MERGE-SOURCE
                 progression: true
                 onClicked: pageStack.push(Qt.resolvedUrl("Storage.qml"))
             }

=== modified file 'plugins/about/Storage.qml'
--- plugins/about/Storage.qml	2015-02-18 15:35:11 +0000
+++ plugins/about/Storage.qml	2015-02-27 05:54:50 +0000
@@ -40,10 +40,17 @@
         for (var i = 0; i < systemDrives.length; i++) {
             var drive = systemDrives[i]
             var path = backendInfo.getDevicePath(drive)
+<<<<<<< TREE
             /* only deal with the device's storage for now, external mounts
                handling would require being smarter on the categories
                computation as well and is not in the current design */
             if (backendInfo.isInternal(drive) &&
+=======
+            /* only deal with the device's storage for now, external mounts
+               handling would require being smarter on the categories
+               computation as well and is not in the current design */
+            if ((type === StorageInfo.InternalDrive) &&
+>>>>>>> MERGE-SOURCE
                 paths.indexOf(path) == -1 && // Haven't seen this device before
                 path.charAt(0) === "/") { // Has a real mount point
                 drives.push(drive)
@@ -61,7 +68,11 @@
     }
     /* Limit the free space to the user available one (see bug #1374134) */
     property real freediskSpace: {
+<<<<<<< TREE
         return backendInfo.getFreeSpace("/home")
+=======
+        return storageInfo.availableDiskSpace("/home")
+>>>>>>> MERGE-SOURCE
     }
 
     property real usedByUbuntu: diskSpace -

=== modified file 'plugins/about/click.cpp'
--- plugins/about/click.cpp	2014-10-31 08:34:19 +0000
+++ plugins/about/click.cpp	2015-02-27 05:54:50 +0000
@@ -43,10 +43,16 @@
  *
  * Will set with information from the first desktop or ini file found and parsed.
  */
+<<<<<<< TREE
 void ClickModel::populateFromDesktopOrIniFile (Click *newClick,
                                                QVariantMap hooks,
                                                QDir directory,
                                                QString name)
+=======
+void ClickModel::populateFromDesktopOrIniFile (Click *newClick,
+                                               QVariantMap hooks,
+                                               QDir directory)
+>>>>>>> MERGE-SOURCE
 {
     QVariantMap appHooks;
     GKeyFile *appinfo = g_key_file_new();
@@ -65,6 +71,7 @@
         if (!appHooks.isEmpty() &&
             (appHooks.contains("desktop") || appHooks.contains("scope")) &&
             directory.exists()) {
+<<<<<<< TREE
 
             if (appHooks.contains("scope"))
             {
@@ -103,6 +110,50 @@
             g_debug ("Desktop or ini file: %s", desktopOrIniFileName);
 
 
+=======
+
+            if (appHooks.contains("scope"))
+            {
+                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]));
+                desktopOrIniFileName =
+                        g_strdup(desktopOrIniFile.fileName().toLocal8Bit().constData());
+                if (!desktopOrIniFile.exists())
+                    goto out;
+
+                /* replace directory so the icon is correctly loaded */
+                directory = scopeDirectory;
+            }
+            else
+            {
+                keyGroup = G_KEY_FILE_DESKTOP_GROUP;
+                keyName = G_KEY_FILE_DESKTOP_KEY_NAME;
+
+                QFile desktopOrIniFile(directory.absoluteFilePath(
+                                      appHooks.value("desktop", "undefined").toString()));
+
+                desktopOrIniFileName =
+                   g_strdup(desktopOrIniFile.fileName().toLocal8Bit().constData());
+
+                if (!desktopOrIniFile.exists())
+                    goto out;
+            }
+
+            g_debug ("Desktop or ini file: %s", desktopOrIniFileName);
+
+
+>>>>>>> MERGE-SOURCE
 
             gboolean loaded = g_key_file_load_from_file(appinfo,
                                                         desktopOrIniFileName,
@@ -189,9 +240,14 @@
 
     if (hooks.isValid()) {
         QVariantMap allHooks(hooks.toMap());
+<<<<<<< TREE
         // The desktop or ini file contains an icon and the display name
         populateFromDesktopOrIniFile(&newClick, allHooks, directory,
                                      manifest.value("name", "").toString());
+=======
+        // The desktop or ini file contains an icon and the display name
+        populateFromDesktopOrIniFile(&newClick, allHooks, directory);
+>>>>>>> MERGE-SOURCE
    }
 
     newClick.installSize = manifest.value("installed-size",

=== modified file 'plugins/about/click.h'
--- plugins/about/click.h	2014-10-31 08:34:19 +0000
+++ plugins/about/click.h	2015-02-27 05:54:50 +0000
@@ -56,10 +56,16 @@
     quint64 getClickSize() const;
 
 private:
+<<<<<<< TREE
     void populateFromDesktopOrIniFile(Click *newClick,
                                       QVariantMap hooks,
                                       QDir directory,
                                       QString name);
+=======
+    void populateFromDesktopOrIniFile(Click *newClick,
+                                      QVariantMap hooks,
+                                      QDir directory);
+>>>>>>> MERGE-SOURCE
     Click buildClick(QVariantMap manifest);
     QList<Click> buildClickList();
 

=== modified file 'plugins/about/storageabout.cpp'
--- plugins/about/storageabout.cpp	2015-02-18 12:06:06 +0000
+++ plugins/about/storageabout.cpp	2015-02-27 05:54:50 +0000
@@ -344,10 +344,19 @@
 QString StorageAbout::getDevicePath(const QString mount_point)
 {
     QString s_mount_point;
-    GUnixMountEntry * g_mount_point = nullptr;
+<<<<<<< TREE
+    GUnixMountEntry * g_mount_point = nullptr;
+=======
+
+    GUnixMountEntry * g_mount_point = nullptr;
+>>>>>>> MERGE-SOURCE
 
     if (!mount_point.isNull() && !mount_point.isEmpty()) {
+<<<<<<< TREE
         g_mount_point = g_unix_mount_at(mount_point.toLocal8Bit(), nullptr);
+=======
+         g_mount_point = g_unix_mount_at(mount_point.toLocal8Bit(), nullptr);
+>>>>>>> MERGE-SOURCE
     }
 
     if (g_mount_point) {

=== modified file 'plugins/about/storageabout.h'
--- plugins/about/storageabout.h	2015-02-19 02:08:15 +0000
+++ plugins/about/storageabout.h	2015-02-27 05:54:50 +0000
@@ -91,9 +91,16 @@
                 READ ubuntuBuildID
                 CONSTANT)
 
+<<<<<<< TREE
     Q_PROPERTY(bool developerMode
                READ getDeveloperMode
                WRITE setDeveloperMode)
+=======
+    Q_PROPERTY(bool developerMode
+               READ getDeveloperMode
+               WRITE setDeveloperMode
+               CONSTANT)
+>>>>>>> MERGE-SOURCE
 
 public:
     explicit StorageAbout(QObject *parent = 0);

=== modified file 'plugins/bluetooth/PageComponent.qml'
--- plugins/bluetooth/PageComponent.qml	2015-02-10 11:19:53 +0000
+++ plugins/bluetooth/PageComponent.qml	2015-02-27 05:54:50 +0000
@@ -29,11 +29,16 @@
 
 ItemPage {
     id: root
+<<<<<<< TREE
     title: i18n.tr("Bluetooth")
     objectName: "bluetoothPage"
 
     property var dialogPopupId
 
+=======
+    title: i18n.tr("Bluetooth")
+
+>>>>>>> MERGE-SOURCE
     UbuntuBluetoothPanel { id: backend }
 
     Component {
@@ -73,6 +78,7 @@
         onPinCodeNeeded: {
             var request_tag = tag
             var popup = PopupUtils.open(providePinCodeDialog, root, {name: device.name})
+<<<<<<< TREE
             popup.canceled.connect(function() {target.providePinCode(request_tag, false, "")})
             popup.provided.connect(function(pinCode) {target.providePinCode(request_tag, true, pinCode)})
         }
@@ -93,6 +99,10 @@
         onPairingDone: {
             if (root.dialogPopupId)
                 PopupUtils.close(root.dialogPopupId)
+=======
+            popup.canceled.connect(function() {target.providePinCode(request_tag, false, "")})
+            popup.provided.connect(function(pinCode) {target.providePinCode(request_tag, true, pinCode)})
+>>>>>>> MERGE-SOURCE
         }
     }
 
@@ -238,6 +248,7 @@
 
             Column {
                 id: connectedList
+<<<<<<< TREE
                 anchors {
                     left: parent.left
                     right: parent.right
@@ -262,6 +273,31 @@
                         }
                         progression: true
                     }
+=======
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                visible: bluetoothActionGroup.enabled && (connectedRepeater.count > 0)
+
+                Repeater {
+                    id: connectedRepeater
+                    model: backend.connectedDevices
+                    delegate: ListItem.Standard {
+                        iconSource: iconPath
+                        iconFrame: false
+                        text: getDisplayName(type, displayName)
+                        control: ActivityIndicator {
+                            visible: connection == Device.Connecting
+                            running: true
+                        }
+                        onClicked: {
+                            backend.setSelectedDevice(addressName);
+                            pageStack.push(connectedDevicePage);
+                        }
+                        progression: true
+                    }
+>>>>>>> MERGE-SOURCE
                 }
             }
 
@@ -279,6 +315,7 @@
 
             Column {
                 id: disconnectedList
+<<<<<<< TREE
                 anchors {
                     left: parent.left
                     right: parent.right
@@ -298,6 +335,27 @@
                             pageStack.push(connectedDevicePage);
                         }
                         progression: true
+=======
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                visible: bluetoothActionGroup.enabled && (disconnectedRepeater.count > 0)
+
+                Repeater {
+                    id: disconnectedRepeater
+                    model: backend.disconnectedDevices
+                    delegate: ListItem.Standard {
+                        iconSource: iconPath
+                        iconFrame: false
+                        text: getDisplayName(type, displayName)
+                        enabled: backend.isSupportedType(type)
+                        onClicked: {
+                            backend.setSelectedDevice(addressName);
+                            pageStack.push(connectedDevicePage);
+                        }
+                        progression: true
+>>>>>>> MERGE-SOURCE
                     }
                 }
             }
@@ -353,6 +411,7 @@
 
         Flickable {
             anchors.fill: parent
+<<<<<<< TREE
             contentHeight: contentItem.childrenRect.height
             boundsBehavior: (contentHeight > root.height) ?
                                 Flickable.DragAndOvershootBounds :
@@ -463,6 +522,117 @@
                         }
                         enabled: backend.selectedDevice && backend.selectedDevice.path.length > 0 ? true : false
                     }
+=======
+            contentHeight: contentItem.childrenRect.height
+            boundsBehavior: (contentHeight > root.height) ?
+                                Flickable.DragAndOvershootBounds :
+                                Flickable.StopAtBounds
+            /* Set the direction to workaround https://bugreports.qt-project.org/browse/QTBUG-31905
+               otherwise the UI might end up in a situation where scrolling doesn't work */
+            flickableDirection: Flickable.VerticalFlick
+
+            Column {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+
+                ListItem.SingleValue {
+                    text: i18n.tr("Name")
+                    value: backend.selectedDevice &&
+                           backend.selectedDevice.name.length > 0 ?
+                                 backend.selectedDevice.name :
+                                 i18n.tr("None")
+                }
+                ListItem.Standard {
+                    Rectangle {
+                        color: "transparent"
+                        anchors.fill: parent
+                        anchors.topMargin: units.gu(1)
+                        anchors.leftMargin: units.gu(2)
+                        anchors.rightMargin: units.gu(2)
+
+                        Label {
+                            anchors {
+                                top: parent.top
+                                left: parent.left
+                                topMargin: units.gu(1)
+                            }
+                            height: units.gu(3)
+                            text: i18n.tr("Type")
+                        }
+                        Image {
+                            anchors {
+                                right: deviceType.left
+                                rightMargin: units.gu(1)
+                            }
+                            height: units.gu(4)
+                            width: units.gu(4)
+                            source: backend.selectedDevice ? backend.selectedDevice.iconName : ""
+                        }
+                        Label {
+                            id: deviceType
+                            anchors {
+                                top: parent.top
+                                right: parent.right
+                                topMargin: units.gu(1)
+                            }
+                            height: units.gu(3)
+                            text: getTypeString(backend.selectedDevice ? backend.selectedDevice.type : Device.OTHER)
+                        }
+                    }
+                }
+                ListItem.SingleValue {
+                    text: i18n.tr("Status")
+                    value: getStatusString(backend.selectedDevice ? backend.selectedDevice.connection : Device.Disconnected)
+                }
+                ListItem.SingleValue {
+                    text: i18n.tr("Signal Strength")
+                    value: getSignalString(backend.selectedDevice ? backend.selectedDevice.strength : Device.None)
+                }
+                ListItem.Standard {
+                    id: trustedCheck
+                    text: i18n.tr("Connect automatically when detected:")
+                    control: CheckBox {
+                        property bool serverChecked: backend.selectedDevice ? backend.selectedDevice.trusted : false
+                        onServerCheckedChanged: checked = serverChecked
+                        Component.onCompleted: checked = serverChecked
+                        onTriggered: {
+                            if (backend.selectedDevice) {
+                                backend.selectedDevice.trusted = checked;
+                            }
+                        }
+                    }
+                }
+                ListItem.SingleControl {
+                    control: Button {
+                        text: backend.selectedDevice && (backend.selectedDevice.connection == Device.Connected || backend.selectedDevice.connection == Device.Connecting) ? i18n.tr("Disconnect") : i18n.tr("Connect")
+                        width: parent.width - units.gu(8)
+                        onClicked: {
+                            if (backend.selectedDevice
+                                && (backend.selectedDevice.connection == Device.Connected
+                                    || backend.selectedDevice.connection == Device.Connecting)) {
+                                backend.disconnectDevice();
+                            } else {
+                                backend.stopDiscovery()
+                                backend.connectDevice(backend.selectedDevice.address);
+                            }
+                            pageStack.pop();
+                        }
+                        visible: backend.selectedDevice ? true : false
+                    }
+                }
+                ListItem.SingleControl {
+                    control: Button {
+                        text: i18n.tr("Forget this device")
+                        width: parent.width - units.gu(8)
+                        onClicked: {
+                            backend.removeDevice();
+                            pageStack.pop();
+                        }
+                        enabled: backend.selectedDevice && backend.selectedDevice.path.length > 0 ? true : false
+                    }
+>>>>>>> MERGE-SOURCE
                 }
             }
         }

=== modified file 'plugins/bluetooth/agent.cpp'
--- plugins/bluetooth/agent.cpp	2015-02-04 16:32:54 +0000
+++ plugins/bluetooth/agent.cpp	2015-02-27 05:54:50 +0000
@@ -22,6 +22,10 @@
 
 #include <cassert>
 
+<<<<<<< TREE
+=======
+
+>>>>>>> MERGE-SOURCE
 /***
 ****
 ***/

=== modified file 'plugins/bluetooth/agent.h'
=== modified file 'plugins/bluetooth/agentadaptor.h'
--- plugins/bluetooth/agentadaptor.h	2015-02-04 10:48:47 +0000
+++ plugins/bluetooth/agentadaptor.h	2015-02-27 05:54:50 +0000
@@ -62,7 +62,7 @@
 "  </interface>\n"
         "")
 public:
-    AgentAdaptor(QObject *parent);
+    explicit AgentAdaptor(QObject *parent);
     virtual ~AgentAdaptor();
 
 public: // PROPERTIES

=== modified file 'plugins/bluetooth/bluetooth.cpp'
--- plugins/bluetooth/bluetooth.cpp	2015-02-10 11:19:53 +0000
+++ plugins/bluetooth/bluetooth.cpp	2015-02-27 05:54:50 +0000
@@ -39,8 +39,13 @@
 {
     // export our Agent to handle pairing requests
     new AgentAdaptor(&m_agent);
+<<<<<<< TREE
     if(!m_dbus.registerObject(DBUS_AGENT_PATH, &m_agent))
         qCritical() << "Couldn't register agent at" << DBUS_AGENT_PATH;
+=======
+    if(!m_dbus.registerObject(DBUS_ADAPTER_AGENT_PATH, &m_agent))
+        qCritical() << "Couldn't register agent at" << DBUS_ADAPTER_AGENT_PATH;
+>>>>>>> MERGE-SOURCE
 
     m_connectedDevices.filterOnConnections(Device::Connection::Connected |
                                            Device::Connection::Connecting |
@@ -157,6 +162,7 @@
 void Bluetooth::disconnectDevice()
 {
     if (m_selectedDevice) {
+<<<<<<< TREE
         auto type = m_selectedDevice->getType();
         switch ((Device::Type)type) {
         case Device::Type::Headset:
@@ -174,6 +180,21 @@
             qWarning() << "Nothing to disconnect: Unsupported device type.";
             break;
         }
+=======
+        auto type = m_selectedDevice->getType();
+        switch ((Device::Type)type) {
+        case Device::Type::Headset:
+        case Device::Type::Headphones:
+        case Device::Type::OtherAudio:
+        case Device::Type::Speakers:
+        case Device::Type::Carkit:
+            m_selectedDevice->disconnect(Device::ConnectionMode::Audio);
+            break;
+        default:
+            qWarning() << "Nothing to disconnect: Unsupported device type.";
+            break;
+        }
+>>>>>>> MERGE-SOURCE
     } else {
         qWarning() << "No selected device to disconnect";
     }
@@ -191,6 +212,7 @@
     }
 
     type = device->getType();
+<<<<<<< TREE
     switch (type) {
     case Device::Type::Headset:
     case Device::Type::Headphones:
@@ -207,12 +229,26 @@
         qWarning() << "Nothing to connect: Unsupported device type.";
         return;
     }
+=======
+    switch (type) {
+    case Device::Type::Headset:
+    case Device::Type::Headphones:
+    case Device::Type::OtherAudio:
+    case Device::Type::Speakers:
+    case Device::Type::Carkit:
+        connMode = Device::ConnectionMode::Audio;
+        break;
+    default:
+        qWarning() << "Nothing to connect: Unsupported device type.";
+        return;
+    }
+>>>>>>> MERGE-SOURCE
 
     if (device->isTrusted()) {
         device->connect(connMode);
     } else {
         m_devices.addConnectAfterPairing(address, connMode);
-        m_devices.createDevice(address);
+        m_devices.createDevice(address, &m_agent);
     }
 }
 

=== modified file 'plugins/bluetooth/bluetooth.h'
--- plugins/bluetooth/bluetooth.h	2015-02-10 11:19:53 +0000
+++ plugins/bluetooth/bluetooth.h	2015-02-27 05:54:50 +0000
@@ -48,8 +48,12 @@
                 NOTIFY selectedDeviceChanged)
 
     Q_PROPERTY (QObject * agent
+<<<<<<< TREE
                 READ getAgent
                 CONSTANT)
+=======
+                READ getAgent)
+>>>>>>> MERGE-SOURCE
 
     Q_PROPERTY (bool powered
                 READ isPowered

=== modified file 'plugins/bluetooth/dbus-shared.h'
--- plugins/bluetooth/dbus-shared.h	2013-09-23 02:55:58 +0000
+++ plugins/bluetooth/dbus-shared.h	2015-02-27 05:54:50 +0000
@@ -21,6 +21,7 @@
 #define USS_DBUS_SHARED_H
 
 #define DBUS_AGENT_PATH "/com/canonical/SettingsBluetoothAgent"
+#define DBUS_ADAPTER_AGENT_PATH "/com/canonical/SettingsBluetoothAgent/adapteragent"
 #define DBUS_AGENT_CAPABILITY "DisplayYesNo"
 
 #endif // USS_DBUS_SHARED_H

=== modified file 'plugins/bluetooth/device.cpp'
=== modified file 'plugins/bluetooth/device.h'
=== modified file 'plugins/bluetooth/devicemodel.cpp'
--- plugins/bluetooth/devicemodel.cpp	2015-02-18 15:13:40 +0000
+++ plugins/bluetooth/devicemodel.cpp	2015-02-27 05:54:50 +0000
@@ -194,6 +194,12 @@
         connect(&m_discoverableTimer, SIGNAL(timeout()), this, SLOT(slotEnableDiscoverable()));
         m_discoverableTimer.start(1000);
 
+        // With the agent registered on the bus, make it known by the adapter
+        QDBusReply<void > reply = m_bluezAdapter->call("RegisterAgent",
+                                                       qVariantFromValue(QDBusObjectPath(DBUS_ADAPTER_AGENT_PATH)),
+                                                       QString(DBUS_AGENT_CAPABILITY));
+        if (!reply.isValid())
+                qWarning() << "Error registering agent for the default adapter:" << reply.error();
     }
 }
 
@@ -462,12 +468,20 @@
     call->deleteLater();
 }
 
-void DeviceModel::createDevice (const QString &address)
+void DeviceModel::createDevice (const QString &address, QObject *agent)
 {
     if (m_bluezAdapter) {
+        QString agent_path(DBUS_AGENT_PATH);
+        agent_path.append("/");
+        agent_path.append(address);
+        agent_path.replace(":", "_");
+
+        if(!m_dbus.registerObject(agent_path, agent))
+            qCritical() << "Couldn't register agent at" << agent_path;
+
         QDBusPendingCall pcall = m_bluezAdapter->asyncCall("CreatePairedDevice",
                                                            address,
-                                                           qVariantFromValue(QDBusObjectPath(DBUS_AGENT_PATH)),
+                                                           qVariantFromValue(QDBusObjectPath(agent_path)),
                                                            QString(DBUS_AGENT_CAPABILITY));
 
         QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
@@ -541,6 +555,7 @@
 
         switch (role) {
         case Qt::DisplayRole:
+<<<<<<< TREE
             displayName = device->getName();
             
             if (displayName.isEmpty())
@@ -550,6 +565,17 @@
                 displayName.append("…");
 
             ret = displayName;
+=======
+            displayName = device->getName();
+ 
+            if (displayName.isEmpty())
+                displayName = device->getAddress();
+
+            if (!device->isPaired())
+                displayName.append("…");
+
+            ret = displayName;
+>>>>>>> MERGE-SOURCE
             break;
 
         case IconRole:

=== modified file 'plugins/bluetooth/devicemodel.h'
--- plugins/bluetooth/devicemodel.h	2014-08-11 09:18:12 +0000
+++ plugins/bluetooth/devicemodel.h	2015-02-27 05:54:50 +0000
@@ -69,7 +69,7 @@
     bool isDiscovering() const { return m_isDiscovering; }
     bool isDiscoverable() const { return m_isDiscoverable; }
     void addConnectAfterPairing(const QString &address, Device::ConnectionMode mode);
-    void createDevice(const QString &address);
+    void createDevice(const QString &address, QObject *agent);
     void removeDevice(const QString &path);
     void stopDiscovery();
     void startDiscovery();

=== modified file 'plugins/cellular/Components/DataMultiSim.qml'
--- plugins/cellular/Components/DataMultiSim.qml	2015-01-20 12:23:34 +0000
+++ plugins/cellular/Components/DataMultiSim.qml	2015-02-27 05:54:50 +0000
@@ -35,12 +35,20 @@
     }
 
     height: childrenRect.height
+<<<<<<< TREE
 
     SettingsItemTitle { text: i18n.tr("Cellular data:") }
+=======
+>>>>>>> MERGE-SOURCE
 
     ListItem.ItemSelector {
         id: use
-        objectName: "data"
+<<<<<<< TREE
+        objectName: "data"
+=======
+        objectName: "data"
+        text: i18n.tr("Cellular data:")
+>>>>>>> MERGE-SOURCE
         expanded: true
         model: {
             // create a model of 'off' and all sim paths

=== modified file 'plugins/cellular/Components/DefaultSim.qml'
=== modified file 'plugins/cellular/Components/NoSim.qml'
--- plugins/cellular/Components/NoSim.qml	2015-02-13 09:50:19 +0000
+++ plugins/cellular/Components/NoSim.qml	2015-02-27 05:54:50 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 /*
  * Copyright (C) 2014 Canonical Ltd
  *
@@ -48,3 +49,49 @@
         wrapMode: Text.WordWrap
     }
 }
+=======
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Jonas G. Drange <[e-mail]>
+ *
+*/
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Column {
+
+    objectName: "noSim"
+
+    ListItem.Standard {
+        text: i18n.tr("Cellular data:")
+        enabled: false
+        control: Switch {
+            checked: false
+        }
+    }
+
+    ListItem.Standard {
+        text: i18n.tr("Data roaming")
+        enabled: false
+        showDivider: false
+        control: Switch {
+            checked: false
+        }
+    }
+}
+>>>>>>> MERGE-SOURCE

=== modified file 'plugins/cellular/Components/RadioSingleSim.qml'
--- plugins/cellular/Components/RadioSingleSim.qml	2015-01-21 20:44:20 +0000
+++ plugins/cellular/Components/RadioSingleSim.qml	2015-02-27 05:54:50 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 /*
  * Copyright (C) 2014 Canonical Ltd
  *
@@ -89,3 +90,92 @@
         }
     }
 }
+=======
+/*
+ * 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 {
+    id: radioSingleSim
+    height: childrenRect.height
+
+    property bool enabled: sim.radioSettings.technologyPreference !== ""
+
+    ListItem.ItemSelector {
+        id: selector
+        showDivider: false
+        expanded: true
+
+        // an empty string is not a valid preference, which means
+        // we disregard the interace and disable the selector
+        enabled: parent.enabled
+        model: sim.radioSettings.modemTechnologies
+        delegate: OptionSelectorDelegate {
+            objectName: sim.path + "_radio_" + modelData
+            text: sim.techToString(modelData)
+            showDivider: false
+        }
+        selectedIndex:
+            sim.radioSettings.technologyPreference !== "" ?
+                    model.indexOf(sim.radioSettings.technologyPreference) : -1
+
+        onDelegateClicked: {
+            if (model[index] === 'umts_enable') {
+                sim.radioSettings.technologyPreference = 'umts';
+                radioSingleSim.parent.umtsModemChanged(sim, sim.connMan.powered ? sim.path : "");
+                sim.mtkSettings.has3G = true;
+            } else {
+                sim.radioSettings.technologyPreference = model[index];
+            }
+        }
+
+        Connections {
+            target: sim.radioSettings
+
+            onTechnologyPreferenceChanged: selector.selectedIndex =
+                sim.radioSettings.modemTechnologies.indexOf(preference)
+
+            onModemTechnologiesChanged: {
+                if ((technologies.indexOf('umts') === -1)
+                     && (sim.mtkSettings.has3G === false)) {
+                    selector.model = sim.addUmtsEnableToModel(technologies);
+                } else {
+                    selector.model = technologies;
+                }
+                selector.selectedIndex = sim.radioSettings.technologyPreference !== "" ?
+                    selector.model.indexOf(sim.radioSettings.technologyPreference) : -1
+            }
+            ignoreUnknownSignals: true
+        }
+
+        Component.onCompleted: {
+            if ((sim.radioSettings.modemTechnologies.indexOf('umts') === -1)
+                 && (sim.mtkSettings.has3G === false)) {
+                selector.model = sim.addUmtsEnableToModel(
+                    sim.radioSettings.modemTechnologies);
+            } else {
+                selector.model = sim.radioSettings.modemTechnologies;
+            }
+        }
+    }
+}
+>>>>>>> MERGE-SOURCE

=== modified file 'plugins/cellular/Components/SimEditor.qml'
--- plugins/cellular/Components/SimEditor.qml	2014-10-31 18:14:35 +0000
+++ plugins/cellular/Components/SimEditor.qml	2015-02-27 05:54:50 +0000
@@ -68,6 +68,7 @@
         }
     ]
 
+<<<<<<< TREE
     NumberAnimation {
         id: scrollerAnimation
         duration: UbuntuAnimation.SnapDuration
@@ -86,6 +87,29 @@
     }
 
     SettingsItemTitle { text: i18n.tr("Edit SIM Name") }
+=======
+    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")
+    }
+>>>>>>> MERGE-SOURCE
 
     ListItem.ExpandablesColumn {
         anchors {

=== modified file 'plugins/cellular/CustomApnEditor.qml'
--- plugins/cellular/CustomApnEditor.qml	2015-02-16 14:02:22 +0000
+++ plugins/cellular/CustomApnEditor.qml	2015-02-27 05:54:50 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 /*
  * This file is part of system-settings
  *
@@ -323,3 +324,330 @@
         } // the contents
     } // the flickable
 }
+=======
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Pat McGowan <[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 QtQuick 2.0
+import QtQuick.Layouts 1.1
+import SystemSettings 1.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+ItemPage {
+    objectName: "customapnPage"
+    id: root
+
+    // "internet" or "mms"
+    property var type
+
+    // dict of "type" : ctx
+    property var contexts;
+
+    /// work around LP(#1361919)
+    property var activateCb;
+
+    QtObject {
+        id: d
+        property var typeText : type === "internet" ? i18n.tr("Internet") : i18n.tr("MMS")
+        property bool isMms : type === "mms"
+
+        property bool isValid : false
+
+        function validateFields() {
+            if (apnName.text === "") {
+                isValid = false;
+                return
+            }
+            if (isMms) {
+                if (mmsc.text === "") {
+                    isValid = false;
+                    return;
+                }
+                /// @todo validate proxy
+                /// @todo force port to be integer and validate it's value
+            }
+
+            // @todo the rest
+            isValid = true;
+        }
+    }
+
+    //TRANSLATORS: %1 is either i18n.tr("Internet") or i18n.tr("MMS")
+    title: i18n.tr("Custom %1 APN").arg(d.typeText)
+
+    // workaround of getting the following error on startup:
+    // WARNING - ... : QML Page: Binding loop detected for property "flickable"
+    flickable: null
+    Component.onCompleted: {
+        flickable: scrollWidget
+
+        var ctx;
+        if (d.isMms) {
+            ctx = contexts["mms"];
+            if (ctx === undefined) {
+                // @bug LP(:#1362795)
+                return;
+            }
+        } else {
+            ctx = contexts["internet"]
+        }
+
+        apnName.text = ctx.accessPointName;
+        userName.text = ctx.username;
+        pword.text = ctx.password;
+        mmsc.text = ctx.messageCenter;
+        var proxyText = ctx.messageProxy.split(":");
+        proxy.text = proxyText[0] !== undefined ? proxyText[0] : "";
+        port.text = proxyText[1] !== undefined ? proxyText[1] : "";
+        /// @todo protocol values
+
+        if (d.isMms) {
+            /// @todo disabled for now
+            doBoth.checked = false;
+            return;
+            var internetApn = contexts["internet"]
+            if (ctx.accessPointName === internetApn.accessPointName &&
+                ctx.username == internetApn.username &&
+                ctx.password == internetApn.password
+                /* auth + procol */) {
+                doBoth.checked = true;
+            }
+            else
+                doBoth.checked = false;
+        }
+    }
+
+    Flickable {
+        id: scrollWidget
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+            margins: units.gu(2)
+        }
+        contentWidth: parent.width
+        clip: true
+        contentHeight: theContents.height
+        boundsBehavior: (contentHeight > height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
+        flickableDirection: Flickable.VerticalFlick
+
+        ColumnLayout {
+            id: theContents
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            spacing: units.gu(2)
+
+            ListItem.Standard {
+                id: sameSwitch
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                /// @todo disable for now
+                //visible: d.isMms
+                visible: false
+                text: i18n.tr("Same APN as for Internet")
+                control: Switch {
+                    id: doBoth
+                    checked: false
+                    anchors.verticalCenter: parent.verticalCenter
+                    onClicked: {
+                        if (checked) {
+                            var internetApn = contexts["internet"]
+                            apnName.text = internetApn.accessPointName;
+                            userName.text = internetApn.username;
+                            pword.text = internetApn.password;
+                        }
+                    }
+                }
+            }
+
+            GridLayout {
+                id: theGrid
+                columns: 2
+                columnSpacing: units.gu(1)
+                rowSpacing: units.gu(1)
+                anchors{
+                    right: parent.right
+                    left:parent.left
+                }
+
+                Label {
+                    //TRANSLATORS: %1 is either i18n.tr("Internet") or i18n.tr("MMS")
+                    text: i18n.tr("%1 APN").arg(d.typeText)
+                }
+                TextField {
+                    id: apnName
+                    enabled: !doBoth.checked
+                    onTextChanged: d.validateFields()
+                    inputMethodHints: Qt.ImhUrlCharactersOnly | Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
+                }
+
+                Label {
+                    text: i18n.tr("MMSC")
+                    visible: d.isMms
+                }
+                TextField {
+                    id: mmsc
+                    visible: d.isMms
+                    onTextChanged: d.validateFields()
+                    inputMethodHints: Qt.ImhUrlCharactersOnly | Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
+                }
+                Label {
+                    text: i18n.tr("Proxy")
+                    visible: d.isMms
+                }
+                TextField {
+                    id: proxy
+                    visible: d.isMms
+                    onTextChanged: d.validateFields()
+                    inputMethodHints: Qt.ImhUrlCharactersOnly | Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
+                }
+                Label {
+                    text: "Port"
+                    visible: d.isMms
+                }
+                TextField {
+                    id: port
+                    visible: d.isMms
+                    maximumLength: 4
+                    onTextChanged: d.validateFields()
+                    inputMethodHints: Qt.ImhDigitsOnly | Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
+                }
+
+                Label {
+                    text: i18n.tr("Username")
+                }
+                TextField {
+                    id: userName
+                    enabled: !doBoth.checked
+                    inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
+                }
+
+                Label {
+                    text: i18n.tr("Password")
+                }
+                TextField {
+                    id: pword
+                    enabled: !doBoth.checked
+                    inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
+                }
+                /// @todo support for ipv6 will be added after RTM
+            }
+
+            Item {
+                id: buttonRectangle
+
+                height: cancelButton.height + units.gu(2)
+
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+
+                Button {
+                    id: cancelButton
+
+                    text: i18n.tr("Cancel")
+
+                    anchors {
+                        left: parent.left
+                        right: parent.horizontalCenter
+                        bottom: parent.bottom
+                        topMargin: units.gu(1)
+                        rightMargin: units.gu(1)
+                        bottomMargin: units.gu(1)
+                    }
+
+                    onClicked: {
+                        pageStack.pop()
+                    }
+                }
+
+                Button {
+                    id: confirmButton
+
+                    text: d.isMms ? i18n.tr("Save") : i18n.tr("Activate")
+
+                    anchors {
+                        left: parent.horizontalCenter
+                        right: parent.right
+                        bottom: parent.bottom
+                        topMargin: units.gu(1)
+                        leftMargin: units.gu(1)
+                        rightMargin: units.gu(4)
+                        bottomMargin: units.gu(1)
+                    }
+
+                    enabled: d.isValid;
+
+                    onClicked: {
+                        var ctx;
+                        if (d.isMms)
+                            ctx = contexts["mms"];
+                        else
+                            ctx = contexts["internet"];
+
+                        /// @bug LP(:#1362795)
+                        if (d.isMms && ctx === undefined) {
+                            var mmsData = ({})
+                            mmsData["accessPointName"] = apnName.text;
+                            mmsData["username"] = userName.text;
+                            mmsData["password"] = pword.text;
+                            mmsData["messageCenter"] = mmsc.text
+                            var proxyValue = "";
+                            if (proxy.text !== "") {
+                                proxyValue = proxy.text;
+                                if (port.text !== "")
+                                    proxyValue = proxyValue + ":" + port.text;
+                            }
+                            mmsData["messageProxy"] = proxyValue;
+                            activateCb("mms", undefined, mmsData);
+                            pageStack.pop();
+                            return;
+                        }
+                        ctx.accessPointName = apnName.text;
+                        ctx.username = userName.text;
+                        ctx.password = pword.text;
+                        if (d.isMms) {
+                            ctx.messageCenter = mmsc.text;
+                            var proxyValue = "";
+                            if (proxy.text !== "") {
+                                proxyValue = proxy.text;
+                                if (port.text !== "")
+                                    proxyValue = proxyValue + ":" + port.text;
+                            }
+                            ctx.messageProxy = proxyValue
+                        }
+                        /// @todo map protocol values
+
+                        activateCb(ctx.type, ctx.contextPath);
+                        pageStack.pop();
+                    }
+                }
+            } // item for buttons
+        } // the contents
+    } // the flickable
+}
+>>>>>>> MERGE-SOURCE

=== modified file 'plugins/language/DisplayLanguage.qml'
=== modified file 'plugins/language/PageComponent.qml'
--- plugins/language/PageComponent.qml	2014-11-04 12:08:12 +0000
+++ plugins/language/PageComponent.qml	2015-02-27 05:54:50 +0000
@@ -61,6 +61,7 @@
         SpellChecking {}
     }
 
+<<<<<<< TREE
     Component {
         id: rebootNecessaryNotification
 
@@ -76,6 +77,22 @@
         }
     }
 
+=======
+    Component {
+        id: rebootNecessaryNotification
+
+        RebootNecessary {
+
+            onReboot: {
+                plugin.reboot();
+            }
+            onRevert: {
+                plugin.currentLanguage = to;
+            }
+        }
+    }
+
+>>>>>>> MERGE-SOURCE
     GSettings {
         id: settings
 

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

=== modified file 'plugins/phone/PageComponent.qml'
--- plugins/phone/PageComponent.qml	2015-01-29 18:26:44 +0000
+++ plugins/phone/PageComponent.qml	2015-02-27 05:54:50 +0000
@@ -76,6 +76,7 @@
     Flickable {
         id: flick
         anchors.fill: parent
+<<<<<<< TREE
         contentWidth: parent.width
         contentHeight: contentItem.childrenRect.height
         boundsBehavior: (contentHeight > root.height) ?
@@ -101,6 +102,33 @@
                 }
                 text: i18n.tr("Dialpad tones")
             }
+=======
+        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 }
+            }
+
+            ListItem.Divider {}
+
+            ListItem.Standard {
+                control: Switch {
+                    objectName: "dialpadSounds"
+                    property bool serverChecked: soundPlugin.dialpadSoundsEnabled
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: soundPlugin.dialpadSoundsEnabled = checked
+                }
+                text: i18n.tr("Dialpad sounds")
+            }
+>>>>>>> MERGE-SOURCE
         }
     }
 }

=== modified file 'plugins/reset/ResetLauncherHome.qml'
=== modified file 'plugins/security-privacy/LockSecurity.qml'
--- plugins/security-privacy/LockSecurity.qml	2015-02-09 15:46:27 +0000
+++ plugins/security-privacy/LockSecurity.qml	2015-02-27 05:54:50 +0000
@@ -202,6 +202,24 @@
                     UbuntuSecurityPrivacyPanel.Passcode
             }
 
+            /* Using bindings since it is, according to documentation,
+            impossible to unset both validator and maximumLength properties */
+            Binding {
+                target: currentInput
+                property: "validator"
+                value:  passcodeValidator
+                when: changeSecurityDialog.oldMethod ===
+                    UbuntuSecurityPrivacyPanel.Passcode
+            }
+
+            Binding {
+                target: currentInput
+                property: "maximumLength"
+                value:  4
+                when: changeSecurityDialog.oldMethod ===
+                    UbuntuSecurityPrivacyPanel.Passcode
+            }
+
             Label {
                 id: incorrect
                 text: ""
@@ -243,6 +261,7 @@
                             UbuntuSecurityPrivacyPanel.Passcode ||
                          changeSecurityDialog.newMethod ===
                             UbuntuSecurityPrivacyPanel.Passphrase
+<<<<<<< TREE
                 onTextChanged: { displayMismatchWarning() }
             }
 
@@ -262,6 +281,26 @@
                 value:  4
                 when: changeSecurityDialog.newMethod ===
                     UbuntuSecurityPrivacyPanel.Passcode
+=======
+            }
+
+            /* Using bindings since it is, according to documentation,
+            impossible to unset both validator and maximumLength properties */
+            Binding {
+                target: newInput
+                property: "validator"
+                value: passcodeValidator
+                when: changeSecurityDialog.newMethod ===
+                    UbuntuSecurityPrivacyPanel.Passcode
+            }
+
+            Binding {
+                target: newInput
+                property: "maximumLength"
+                value:  4
+                when: changeSecurityDialog.newMethod ===
+                    UbuntuSecurityPrivacyPanel.Passcode
+>>>>>>> MERGE-SOURCE
             }
 
             Label {
@@ -319,6 +358,24 @@
                     UbuntuSecurityPrivacyPanel.Passcode
             }
 
+            /* Using bindings since it is, according to documentation,
+            impossible to unset both validator and maximumLength properties */
+            Binding {
+                target: confirmInput
+                property: "validator"
+                value:  passcodeValidator
+                when: changeSecurityDialog.newMethod ===
+                    UbuntuSecurityPrivacyPanel.Passcode
+            }
+
+            Binding {
+                target: confirmInput
+                property: "maximumLength"
+                value:  4
+                when: changeSecurityDialog.newMethod ===
+                    UbuntuSecurityPrivacyPanel.Passcode
+            }
+
             Label {
                 id: notMatching
                 wrapMode: Text.Wrap
@@ -366,6 +423,7 @@
                         else
                             return i18n.tr("Set")
                     }
+<<<<<<< TREE
                     /* see https://wiki.ubuntu.com/SecurityAndPrivacySettings#Phone for details */
                     enabled: /* Validate the old method, it's either swipe or a secret which needs
                                 to be valid, 4 digits for the passcode or > 0 for a passphrase */
@@ -383,6 +441,9 @@
                              /* or to be swipe */
                              changeSecurityDialog.newMethod === UbuntuSecurityPrivacyPanel.Swipe)
 
+=======
+                    enabled: newInput.acceptableInput
+>>>>>>> MERGE-SOURCE
                     onClicked: {
                         changeSecurityDialog.enabled = false
                         incorrect.text = ""

=== modified file 'plugins/security-privacy/PhoneLocking.qml'
--- plugins/security-privacy/PhoneLocking.qml	2015-02-09 15:42:47 +0000
+++ plugins/security-privacy/PhoneLocking.qml	2015-02-27 05:54:50 +0000
@@ -42,7 +42,11 @@
         anchors.right: parent.right
 
         ListItem.SingleValue {
+<<<<<<< TREE
             property string swipe: i18n.ctr("Unlock with swipe", "None")
+=======
+            property string swipe: qsTr("None", "Unlock with swipe")
+>>>>>>> MERGE-SOURCE
             property string passcode: i18n.tr("Passcode")
             property string passphrase: i18n.tr("Passphrase")
 

=== modified file 'plugins/security-privacy/SimPin.qml'
--- plugins/security-privacy/SimPin.qml	2015-01-28 15:17:09 +0000
+++ plugins/security-privacy/SimPin.qml	2015-02-27 05:54:50 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 /*
  * Copyright (C) 2014 Canonical Ltd.
  *
@@ -388,3 +389,394 @@
         }
     }
 }
+=======
+/*
+ * 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 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/>.
+ *
+ * Authors:
+ * Ken VanDine <[e-mail]>
+ *
+ */
+
+import GSettings 1.0
+import QtQuick 2.0
+import QtQuick.Layouts 1.1
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components.Popups 0.1
+import SystemSettings 1.0
+import Ubuntu.SystemSettings.SecurityPrivacy 1.0
+import MeeGo.QOfono 0.2
+import "sims.js" as Sims
+
+
+ItemPage {
+    id: root
+    title: i18n.tr("SIM PIN")
+
+    property var sims
+    property var curSim
+
+    Component {
+        id: dialogComponent
+
+        Dialog {
+            id: changePinDialog
+            title: i18n.tr("Change SIM PIN")
+
+            property string errorText: i18n.tr(
+                    "Incorrect PIN. %1 attempt remaining.",
+                    "Incorrect PIN. %1 attempts remaining.",
+                    curSim.pinRetries[OfonoSimManager.SimPin] || 3
+                    ).arg(curSim.pinRetries[OfonoSimManager.SimPin] || 3)
+            property int simMin: curSim.minimumPinLength(OfonoSimManager.SimPin)
+            property int simMax: curSim.maximumPinLength(OfonoSimManager.SimPin)
+
+            // This is a bit hacky, but the contents of this dialog get so tall
+            // that on a mako device, they don't fit with the OSK also visible.
+            // So we scrunch up spacing.
+            Binding {
+                target: __foreground
+                property: "itemSpacing"
+                value: units.gu(1)
+            }
+
+            Connections {
+                target: curSim
+                onChangePinComplete: {
+                    if (error === OfonoSimManager.FailedError) {
+                        console.warn("Change PIN failed with: " + error);
+                        incorrect.visible = true;
+                        changePinDialog.enabled = true;
+                        currentInput.forceActiveFocus();
+                        currentInput.selectAll();
+                        return;
+                    }
+                    incorrect.visible = false;
+                    changePinDialog.enabled = true;
+                    PopupUtils.close(changePinDialog);
+                }
+            }
+
+            Label {
+                text: i18n.tr("Current PIN:")
+            }
+
+            TextField {
+                id: currentInput
+                echoMode: TextInput.Password
+                inputMethodHints: Qt.ImhDialableCharactersOnly
+                maximumLength: simMax
+            }
+
+            Label {
+                id: retries
+                text: i18n.tr("%1 attempt allowed.", "%1 attempts allowed.",
+                              curSim.pinRetries[OfonoSimManager.SimPin] || 3).arg(
+                          curSim.pinRetries[OfonoSimManager.SimPin] || 3)
+                visible: !incorrect.visible
+            }
+
+            Label {
+                id: incorrect
+                text: errorText
+                visible: false
+                color: "darkred"
+            }
+
+            Label {
+                text: i18n.tr("Choose new PIN:")
+            }
+
+            TextField {
+                id: newInput
+                echoMode: TextInput.Password
+                inputMethodHints: Qt.ImhDialableCharactersOnly
+                maximumLength: simMax
+            }
+
+            Label {
+                text: i18n.tr("Confirm new PIN:")
+            }
+
+            TextField {
+                id: confirmInput
+                echoMode: TextInput.Password
+                inputMethodHints: Qt.ImhDialableCharactersOnly
+                maximumLength: simMax
+
+                // Doesn't get updated if you set this in enabled of confirmButton
+                onTextChanged: confirmButton.enabled =
+                               (acceptableInput &&
+                                text.length >= simMin &&
+                                (text === newInput.text))
+            }
+
+            Label {
+                id: notMatching
+                wrapMode: Text.Wrap
+                text: i18n.tr("PINs don't match. Try again.")
+                visible: (newInput.length === confirmInput.length) &&
+                         (newInput.text != confirmInput.text)
+                color: "darkred"
+            }
+
+            RowLayout {
+                spacing: units.gu(1)
+
+                Button {
+                    Layout.fillWidth: true
+                    color: UbuntuColors.lightGrey
+                    text: i18n.tr("Cancel")
+                    onClicked: PopupUtils.close(changePinDialog)
+                }
+
+                Button {
+                    id: confirmButton
+                    Layout.fillWidth: true
+                    color: UbuntuColors.green
+                    text: i18n.tr("Change")
+                    enabled: false
+                    onClicked: {
+                        changePinDialog.enabled = false
+                        var match = (newInput.text === confirmInput.text)
+                        notMatching.visible = !match
+                        if (!match) {
+                            changePinDialog.enabled = true
+                            newInput.forceActiveFocus()
+                            newInput.selectAll()
+                            return
+                        }
+                        curSim.changePin(OfonoSimManager.SimPin, currentInput.text, newInput.text);
+                    }
+                }
+            }
+        }
+    }
+
+    Component {
+        id: lockDialogComponent
+
+        Dialog {
+            id: lockPinDialog
+            objectName: "lockDialogComponent"
+            title: curSim.lockedPins.length > 0 ?
+                       i18n.tr("Enter SIM PIN") :
+                       i18n.tr("Enter Previous SIM PIN")
+
+            property string errorText: i18n.tr(
+                    "Incorrect PIN. %1 attempts remaining."
+                    ).arg(curSim.pinRetries[OfonoSimManager.SimPin] || 3)
+
+            property int simMin: curSim.minimumPinLength(OfonoSimManager.SimPin)
+            property int simMax: curSim.maximumPinLength(OfonoSimManager.SimPin)
+
+            // This is a bit hacky, but the contents of this dialog get so tall
+            // that on a mako device, they don't fit with the OSK also visible.
+            // So we scrunch up spacing.
+            Binding {
+                target: __foreground
+                property: "itemSpacing"
+                value: units.gu(1)
+            }
+
+            Connections {
+                target: curSim
+                onLockPinComplete: {
+                    if (error === OfonoSimManager.FailedError) {
+                        console.warn("Lock PIN failed with: " + error);
+                        incorrect.visible = true;
+                        lockPinDialog.enabled = true;
+                        prevInput.forceActiveFocus();
+                        prevInput.selectAll();
+                        return;
+                    }
+                    incorrect.visible = false;
+                    lockPinDialog.enabled = true;
+                    PopupUtils.close(lockPinDialog);
+                }
+                onUnlockPinComplete: {
+                    if (error === OfonoSimManager.FailedError) {
+                        console.warn("Unlock PIN failed with: " + error);
+                        incorrect.visible = true;
+                        lockPinDialog.enabled = true;
+                        prevInput.forceActiveFocus();
+                        prevInput.selectAll();
+                        return;
+                    }
+                    incorrect.visible = false;
+                    lockPinDialog.enabled = true;
+                    PopupUtils.close(lockPinDialog);
+                }
+            }
+
+            TextField {
+                id: prevInput
+                objectName: "prevInput"
+                echoMode: TextInput.Password
+                inputMethodHints: Qt.ImhDialableCharactersOnly
+                maximumLength: simMax
+
+                // Doesn't get updated if you set this in enabled of confirmButton
+                onTextChanged: lockButton.enabled =
+                               (acceptableInput && text.length >= simMin)
+            }
+
+            Label {
+                horizontalAlignment: Text.AlignHCenter
+                text: i18n.tr("%1 attempts allowed.").arg(
+                          curSim.pinRetries[OfonoSimManager.SimPin] || 3)
+                visible: !incorrect.visible
+                width: parent.width
+            }
+
+            Label {
+                id: incorrect
+                text: errorText
+                visible: false
+                color: "darkred"
+            }
+
+            RowLayout {
+                spacing: units.gu(1)
+
+                Button {
+                    objectName: "cancelButton"
+                    Layout.fillWidth: true
+                    color: UbuntuColors.lightGrey
+                    text: i18n.tr("Cancel")
+                    onClicked: {
+                        if (curSim.lockedPins.length < 1)
+                            caller.checked = false;
+                        else
+                            caller.checked = true;
+                        PopupUtils.close(lockPinDialog);
+                    }
+                }
+
+                Button {
+                    id: lockButton
+                    objectName: "lockButton"
+                    Layout.fillWidth: true
+                    color: UbuntuColors.green
+
+                    text: curSim.lockedPins.length > 0 ? i18n.tr("Unlock") : i18n.tr("Lock")
+                    enabled: false
+                    onClicked: {
+                        lockPinDialog.enabled = false;
+                        if (curSim.lockedPins.length > 0)
+                            curSim.unlockPin(OfonoSimManager.SimPin, prevInput.text);
+                        else
+                            curSim.lockPin(OfonoSimManager.SimPin, prevInput.text);
+                    }
+                }
+            }
+        }
+    }
+
+    Column {
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        Repeater {
+            model: sims.length
+            Column {
+                id: sim
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+
+                states: [
+                    State {
+                        name: "locked"
+                        when: sims[index].simMng.pinRequired !== OfonoSimManager.NoPin
+                    },
+                    State {
+                        name: "unlocked"
+                        when: sims[index].simMng.pinRequired === OfonoSimManager.NoPin
+                    }
+                ]
+
+                Connections {
+                    target: sims[index].simMng
+                    onLockedPinsChanged: {
+                        simPinSwitch.checked =
+                                sims[index].simMng.lockedPins.length > 0;
+                    }
+                }
+
+                ListItem.Standard {
+                    text: sims[index].title
+                    visible: sims.length > 1
+                }
+
+                ListItem.Standard {
+                    text: i18n.tr("SIM PIN")
+                    control: Switch {
+                        id: simPinSwitch
+                        objectName: "simPinSwitch"
+                        checked: sims[index].simMng.lockedPins.length > 0
+                        onClicked: {
+                            curSim = sims[index].simMng;
+                            PopupUtils.open(lockDialogComponent, simPinSwitch);
+                        }
+                    }
+                }
+
+                ListItem.Standard {
+                    id: changeControl
+                    visible: sim.state === "unlocked"
+                    text: i18n.tr("Unlocked")
+                    control: Button {
+                        enabled: parent.visible
+                        text: i18n.tr("Change PIN…")
+                        onClicked: {
+                            curSim = sims[index].simMng;
+                            PopupUtils.open(dialogComponent);
+                        }
+                    }
+                }
+
+                ListItem.Standard {
+                    id: lockControl
+                    visible: sim.state === "locked"
+                    text: i18n.tr("Locked")
+                    control: Button {
+                        objectName: "unlock"
+                        enabled: sims[index].simMng.pinRequired !== 'none'
+                        text: i18n.tr("Unlock…")
+                        color: UbuntuColors.green
+                        onClicked: Connectivity.unlockModem(sims[index].path)
+                    }
+                }
+
+                ListItem.Divider {
+                    visible: index < (sims.length - 1)
+                }
+
+            }
+        }
+
+        ListItem.Caption {
+            text: i18n.tr("When a SIM PIN is set, it must be entered to access cellular services after restarting the phone or swapping the SIM.")
+        }
+
+        ListItem.Caption {
+            text: i18n.tr("Entering an incorrect PIN repeatedly may lock the SIM permanently.")
+        }
+    }
+}
+>>>>>>> MERGE-SOURCE

=== modified file 'plugins/sound/PageComponent.qml'
--- plugins/sound/PageComponent.qml	2015-02-11 17:33:51 +0000
+++ plugins/sound/PageComponent.qml	2015-02-27 05:54:50 +0000
@@ -158,6 +158,7 @@
             }
 
             ListItem.Standard {
+<<<<<<< TREE
                 control: Switch {
                     objectName: "dialpadSounds"
                     property bool serverChecked: backendInfo.dialpadSoundsEnabled
@@ -169,6 +170,19 @@
             }
 
             SettingsItemTitle {
+=======
+                control: Switch {
+                    objectName: "dialpadSounds"
+                    property bool serverChecked: backendInfo.dialpadSoundsEnabled
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: backendInfo.dialpadSoundsEnabled = checked
+                }
+                text: i18n.tr("Dialpad sounds")
+            }
+
+            SettingsItemTitle {
+>>>>>>> MERGE-SOURCE
                 text: i18n.tr("Messages:")
             }
 
@@ -213,6 +227,7 @@
 
             ListItem.Standard {
                 text: i18n.tr("Keyboard sound")
+                showDivider: false
 
                 control: Switch {
                     objectName: "keyboardSoundSwitch"
@@ -231,6 +246,7 @@
                 text: i18n.tr("Lock sound")
                 visible: showAllUI
             }
+<<<<<<< TREE
 
             ListItem.Divider {
                 visible: showAllUI
@@ -247,6 +263,21 @@
                 }
                 visible: showAllUI
             }
+=======
+
+            ListItem.Divider {}
+
+            ListItem.Standard {
+                text: i18n.tr("Other vibrations")
+                control: Switch {
+                    objectName: "otherVibrateSwitch"
+                    property bool serverChecked: backendInfo.otherVibrate
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: backendInfo.otherVibrate = checked
+                }
+            }
+>>>>>>> MERGE-SOURCE
         }
     }
 }

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2015-02-20 14:40:34 +0000
+++ plugins/system-update/PageComponent.qml	2015-02-27 05:54:50 +0000
@@ -45,6 +45,7 @@
     property bool batterySafeForUpdate: isCharging || chargeLevel > 25
     property var chargeLevel: indicatorPower.batteryLevel || 0
     property var notificationAction;
+<<<<<<< TREE
     property string errorDialogText: ""
 
     onUpdatesAvailableChanged: {
@@ -86,6 +87,44 @@
             root.state = "SEARCHING";
             UpdateManager.checkUpdates();
         }
+=======
+    property string errorDialogText: ""
+
+    QDBusActionGroup {
+        id: indicatorPower
+        busType: 1
+        busName: "com.canonical.indicator.power"
+        objectPath: "/com/canonical/indicator/power"
+        property variant batteryLevel: action("battery-level").state
+        property variant deviceState: action("device-state").state
+        Component.onCompleted: start()
+    }
+
+    Connections {
+        id: networkingStatus
+        target: NetworkingStatus
+        onOnlineChanged: {
+            if (NetworkingStatus.online) {
+                activity.running = true;
+                root.state = "SEARCHING";
+                UpdateManager.checkUpdates();
+            } else {
+                activity.running = false;
+            }
+        }
+    }
+
+    Setup {
+        id: uoaConfig
+        applicationId: "ubuntu-system-settings"
+        providerId: "ubuntuone"
+
+        onFinished: {
+            credentialsNotification.visible = false;
+            root.state = "SEARCHING";
+            UpdateManager.checkUpdates();
+        }
+>>>>>>> MERGE-SOURCE
     }
 
     Component {
@@ -202,11 +241,14 @@
 
         onCredentialsNotFound: {
             credentialsNotification.visible = true;
+<<<<<<< TREE
         }
 
         onCredentialsDeleted: {
             credentialsNotification.visible = false;
             uoaConfig.exec();
+=======
+>>>>>>> MERGE-SOURCE
         }
 
         onSystemUpdateDownloaded: {
@@ -256,6 +298,7 @@
             id: columnId
             anchors {
                 left: parent.left
+<<<<<<< TREE
                 right: parent.right
             }
             height: childrenRect.height
@@ -397,7 +440,151 @@
                         console.warn("PAUSE: " + modelData.packageName);
                         if (modelData.systemUpdate)
                             return UpdateManager.pauseDownload(modelData.packageName);
+=======
+                right: parent.right
+            }
+            height: childrenRect.height
+            
+            ListItem.Base {
+                id: checkForUpdatesArea
+                objectName: "checkForUpdatesArea"
+                showDivider: false
+                visible: false
+
+                ActivityIndicator {
+                    id: activity
+                    running: checkForUpdatesArea.visible
+                    visible: activity.running
+                    anchors {
+                        left: parent.left
+                        top: parent.top
+                    }
+                    height: parent.height
+                }
+
+                Label {
+                    text: activity.running ? i18n.tr("Checking for updates…") : i18n.tr("Connect to the Internet to check for updates")
+                    verticalAlignment: Text.AlignVCenter
+                    elide: Text.ElideRight
+                    anchors {
+                        left: activity.running ? activity.right : parent.left
+                        top: parent.top
+                        right: btnRetry.left
+                        rightMargin: units.gu(2)
+                        leftMargin: units.gu(2)
+                    }
+                    height: parent.height
+                }
+
+                Button {
+                    id: btnRetry
+                    text: i18n.tr("Retry")
+                    color: UbuntuColors.orange
+                    anchors {
+                        right: parent.right
+                        top: parent.top
+                        bottom: parent.bottom
+                        margins: units.gu(1)
+                    }
+                    visible: !activity.visible
+
+                    onClicked: {
+                        activity.running = true;
+                        root.state = "SEARCHING";
+                        UpdateManager.checkUpdates();
+                    }
+                }
+            }
+
+            ListItem.SingleControl {
+                height: installAllButton.visible ? units.gu(8) : units.gu(2)
+                highlightWhenPressed: false
+                control: Button {
+                    id: installAllButton
+                    objectName: "installAllButton"
+                    property string primaryText: includeSystemUpdate ?
+                                                     i18n.tr("Install %1 update…", "Install %1 updates…", root.updatesAvailable).arg(root.updatesAvailable) :
+                                                     i18n.tr("Install %1 update", "Install %1 updates", root.updatesAvailable).arg(root.updatesAvailable)
+                    property string secondaryText: i18n.tr("Pause All")
+                    color: UbuntuColors.orange
+                    text: root.installAll ? secondaryText : primaryText
+                    width: parent.width - units.gu(4)
+
+                    onClicked: {
+                        for (var i=0; i < updateList.count; i++) {
+                            updateList.currentIndex = i;
+                            var item = updateList.currentItem;
+                            var modelItem = UpdateManager.model[i];
+                            if (item.installing || item.installed)
+                                continue;
+                            console.warn("AllClicked: " + modelItem.updateState + " " + modelItem.updateReady + " " +  modelItem.selected);
+                            if (item.retry) {
+                                item.retry = false;
+                                UpdateManager.retryDownload(modelItem.packageName);
+                                continue;
+                            }
+                            if (root.installAll && !modelItem.updateReady && modelItem.selected) {
+                                item.pause();
+                                continue;
+                            }
+                            console.warn("Past pause");
+                            if (!root.installAll && !modelItem.updateReady && modelItem.selected) {
+                                item.resume();
+                                continue;
+                            }
+                            console.warn("Past resume");
+                            if (!root.installAll && !modelItem.updateState && !modelItem.updateReady && !modelItem.selected) {
+                                item.start();
+                                continue;
+                            }
+                            console.warn("Past start");
+                        }
+                        root.installAll = !root.installAll;
+                    }
+                }
+                showDivider: false
+            }
+
+            ListView {
+                id: updateList
+                objectName: "updateList"
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                model: UpdateManager.model
+                height: childrenRect.height
+                interactive: false
+                spacing: units.gu(2)
+
+                delegate: ListItem.Subtitled {
+                    id: listItem
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                    }
+                    iconSource: Qt.resolvedUrl(modelData.iconUrl)
+                    iconFrame: modelData.systemUpdate ? false : true
+                    height: visible ? textArea.height : 0
+                    highlightWhenPressed: false
+                    showDivider: false
+                    visible: opacity > 0
+                    opacity: installed ? 0 : 1
+                    Behavior on opacity { PropertyAnimation { duration: UbuntuAnimation.SleepyDuration } }
+
+                    property alias actionButton: buttonAppUpdate
+                    property alias progressBar: progress
+                    property bool installing: !modelData.systemUpdate && (modelData.updateReady || (progressBar.value === progressBar.maximumValue))
+                    property bool installed: false
+                    property bool retry: false
+
+                    function pause () {
+                        console.warn("PAUSE: " + modelData.packageName);
+                        if (modelData.systemUpdate)
+                            return UpdateManager.pauseDownload(modelData.packageName);
+>>>>>>> MERGE-SOURCE
                         modelData.updateState = false;
+<<<<<<< TREE
                         tracker.pause();
                     }
 
@@ -660,6 +847,269 @@
                         right: parent.right
                     }
                 }
+=======
+                        tracker.pause();
+                    }
+
+                    function resume () {
+                        console.warn("RESUME: " + modelData.packageName);
+                        if (modelData.systemUpdate)
+                            return UpdateManager.startDownload(modelData.packageName);
+                        modelData.updateState = true;
+                        tracker.resume();
+                    }
+
+                    function start () {
+                        console.warn("START: " + modelData.packageName);
+                        modelData.selected = true;
+                        modelData.updateState = true;
+                        UpdateManager.startDownload(modelData.packageName);
+                    }
+                    Column {
+                        id: textArea
+                        objectName: "textArea"
+                        anchors {
+                            left: parent.left
+                            right: parent.right
+                        }
+                        spacing: units.gu(0.5)
+
+                        Item {
+                            anchors {
+                                left: parent.left
+                                right: parent.right
+                            }
+                            height: buttonAppUpdate.height
+                            
+                            Label {
+                                id: labelTitle
+                                objectName: "labelTitle"
+                                anchors {
+                                    left: parent.left
+                                    right: buttonAppUpdate.visible ? buttonAppUpdate.left : parent.right
+                                    verticalCenter: parent.verticalCenter
+                                }
+                                text: modelData.title
+                                font.bold: true
+                                elide: Text.ElideMiddle
+                            }
+
+                            Button {
+                                id: buttonAppUpdate
+                                objectName: "buttonAppUpdate"
+                                anchors.right: parent.right
+                                height: labelTitle.height + units.gu(1)
+                                enabled: !installing 
+                                text: {
+                                    if (retry)
+                                        return i18n.tr("Retry");
+                                    if (modelData.systemUpdate) {
+                                        if (modelData.updateReady) {
+                                            return i18n.tr("Install…");
+                                        } else if (!modelData.updateState && !modelData.selected) {
+                                            return i18n.tr("Download");
+                                        }
+                                    }
+                                    if (modelData.updateState) {
+                                        return i18n.tr("Pause");
+                                    } else if (modelData.selected) {
+                                        return i18n.tr("Resume");
+                                    }
+                                    return i18n.tr("Update");
+                                }
+
+                                onClicked: {
+                                    if (retry) {
+                                        retry = false;
+                                        return UpdateManager.retryDownload(modelData.packageName);
+                                    }
+                                    if (modelData.updateState)
+                                        return pause();
+                                    if (!modelData.updateState && modelData.selected)
+                                        return resume();
+                                    if (!modelData.updateState && !modelData.selected && !modelData.updateReady)
+                                        return start();
+                                    if (modelData.updateReady)
+                                        PopupUtils.open(dialogInstallComponent);
+                                }
+                            }
+                        } 
+                        
+                        Item {
+                            id: labelUpdateStatus
+                            anchors {
+                                left: parent.left
+                                right: parent.right
+                            }
+                            height: childrenRect.height
+                            visible: opacity > 0
+                            opacity: (modelData.updateState && modelData.selected && !modelData.updateReady) || (installing || installed) ? 1 : 0
+                            Behavior on opacity { PropertyAnimation { duration: UbuntuAnimation.SleepyDuration } }
+                            Label {
+                                objectName: "labelUpdateStatus"
+                                anchors.left: parent.left
+                                anchors.right: updateStatusLabel.left
+                                elide: Text.ElideMiddle
+                                fontSize: "small"
+                                text: {
+                                    if (retry)
+                                        return modelData.error;
+                                    if (installing)
+                                        return i18n.tr("Installing");
+                                    if (installed)
+                                        return i18n.tr("Installed");
+                                    return i18n.tr("Downloading");
+                                }
+                            }
+                            Label {
+                                id: updateStatusLabel
+                                anchors.right: parent.right
+                                visible: !labelSize.visible && !installing && !installed
+                                fontSize: "small"
+                                text: {
+                                    if (!labelUpdateStatus.visible)
+                                        return convert_bytes_to_size(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)
+                                    );
+                                }
+                            }
+                        }
+
+                        ProgressBar {
+                            id: progress
+                            objectName: "progress"
+                            height: units.gu(2)
+                            anchors {
+                                left: parent.left
+                                right: parent.right
+                            }
+                            visible: opacity > 0
+                            opacity: modelData.selected && !modelData.updateReady && !installed ? 1 : 0
+                            value: modelData.systemUpdate ? modelData.downloadProgress : tracker.progress
+                            minimumValue: 0
+                            maximumValue: 100
+
+                            DownloadTracker {
+                                id: tracker
+                                objectName: "tracker"
+                                packageName: modelData.packageName
+                                clickToken: modelData.clickToken
+                                download: modelData.downloadUrl
+
+                                onFinished: {
+                                    progress.visible = false;
+                                    buttonAppUpdate.visible = false;
+                                    installed = true;
+                                    installing = false;
+                                    root.updatesAvailable -= 1;
+                                    modelData.updateRequired = false;
+                                    UpdateManager.updateClickScope();
+                                }
+
+                                onProcessing: {
+                                    console.warn("onProcessing: " + modelData.packageName + " " + path);
+                                    buttonAppUpdate.enabled = false;
+                                    installing = true;
+                                    modelData.updateState = false;
+                                }
+
+                                onStarted: {
+                                    console.warn("onStarted: " + modelData.packageName + " " + success);
+                                    if (success)
+                                        modelData.updateState = true;
+                                    else
+                                        modelData.updateState = false;
+                                }
+
+                                onPaused: {
+                                    console.warn("onPaused: " + modelData.packageName + " " + success);
+                                    if (success)
+                                        modelData.updateState = false;
+                                    else
+                                        modelData.updateState = true;
+                                }
+
+                                onResumed: {
+                                    console.warn("onResumed: " + modelData.packageName + " " + success);
+                                    if (success)
+                                        modelData.updateState = true;
+                                    else
+                                        modelData.updateState = false;
+                                }
+
+                                onCanceled: {
+                                    console.warn("onCanceled: " + modelData.packageName + " " + success);
+                                    if (success) {
+                                        modelData.updateState = false;
+                                        modelData.selected = false;
+                                    }
+                                }
+
+                                onErrorFound: {
+                                    console.warn("onErrorFound: " + modelData.packageName + " " + error);
+                                    modelData.updateState = false;
+                                    retry = true;
+                                    installing = false;
+                                }
+                            }
+
+                            Behavior on opacity { PropertyAnimation { duration: UbuntuAnimation.SleepyDuration } }
+                        }
+
+                        Item {
+                            anchors {
+                                left: parent.left
+                                right: parent.right
+                            }
+                            height: childrenRect.height
+                            Label {
+                                id: labelVersion
+                                objectName: "labelVersion"
+                                anchors.left: parent.left
+                                text: modelData.remoteVersion ? i18n.tr("Version: ") + modelData.remoteVersion : ""
+                                elide: Text.ElideRight
+                                fontSize: "small"
+                            }
+                            
+                            Label {
+                                id: labelSize
+                                objectName: "labelSize"
+                                anchors.right: parent.right
+                                text: convert_bytes_to_size(modelData.binaryFilesize)
+                                fontSize: "small"
+                                visible: !labelUpdateStatus.visible && !installing && !installed
+                            }
+                        }
+                    }
+                }
+            }
+
+            Column {
+                id: credentialsNotification
+                objectName: "credentialsNotification"
+
+                visible: false
+
+                spacing: units.gu(2)
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                ListItem.ThinDivider {}
+
+                Label {
+                    text: i18n.tr("Sign in to Ubuntu One to receive updates for apps.")
+                    horizontalAlignment: Text.AlignHCenter
+                    wrapMode: Text.Wrap
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                    }
+                }
+>>>>>>> MERGE-SOURCE
                 Button {
                     text: i18n.tr("Sign In…")
                     anchors {
@@ -735,8 +1185,38 @@
         }
     }
 
-    Column {
-        id: configuration
+<<<<<<< TREE
+    Column {
+        id: configuration
+=======
+    Column {
+        id: configuration
+
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        ListItem.ThinDivider {}
+        ListItem.SingleValue {
+            objectName: "configuration"
+            text: i18n.tr("Auto download")
+            value: {
+                if (UpdateManager.downloadMode === 0)
+                    return i18n.tr("Never")
+                else if (UpdateManager.downloadMode === 1)
+                    return i18n.tr("On wi-fi")
+                else if (UpdateManager.downloadMode === 2)
+                    return i18n.tr("Always")
+            }
+            progression: true
+            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;
+>>>>>>> MERGE-SOURCE
 
         anchors.bottom: parent.bottom
         anchors.left: parent.left

=== modified file 'plugins/system-update/download_tracker.cpp'
--- plugins/system-update/download_tracker.cpp	2015-01-23 10:01:34 +0000
+++ plugins/system-update/download_tracker.cpp	2015-02-27 05:54:50 +0000
@@ -18,10 +18,22 @@
  * Authored by: Diego Sarmentero <[e-mail]>
  */
 
-#include <ubuntu/download_manager/download_struct.h>
-#include <ubuntu/download_manager/error.h>
-#include <QProcessEnvironment>
-
+<<<<<<< TREE
+#include <ubuntu/download_manager/download_struct.h>
+#include <ubuntu/download_manager/error.h>
+#include <QProcessEnvironment>
+=======
+#include <QDebug>
+#include <QProcessEnvironment>
+
+#include <ubuntu/download_manager/download_struct.h>
+#include <ubuntu/download_manager/error.h>
+
+#include "download_tracker.h"
+#include "network/network.h"
+>>>>>>> MERGE-SOURCE
+
+<<<<<<< TREE
 #include "download_tracker.h"
 #include "network/network.h"
 
@@ -32,6 +44,13 @@
     const QString PKCON_COMMAND = "pkcon";
     const QString DOWNLOAD_MANAGER_SHA512 = "sha512";
 }
+=======
+namespace {
+    const QString DOWNLOAD_COMMAND = "post-download-command";
+    const QString APP_ID = "app_id";
+    const QString PKCON_COMMAND = "pkcon";
+}
+>>>>>>> MERGE-SOURCE
 
 namespace UpdatePlugin {
 

=== modified file 'plugins/system-update/download_tracker.h'
--- plugins/system-update/download_tracker.h	2015-01-23 09:47:18 +0000
+++ plugins/system-update/download_tracker.h	2015-02-27 05:54:50 +0000
@@ -81,6 +81,7 @@
     void errorFound(const QString &error);
 
 private:
+<<<<<<< TREE
     QString m_clickToken = QString::null;
     QString m_downloadUrl = QString::null;
     QString m_packageName = QString::null;
@@ -88,6 +89,14 @@
     Manager* m_manager = nullptr;
     int m_progress = 0;
     QString m_download_sha512 = QString::null;
+=======
+    QString m_clickToken = QString::null;
+    QString m_downloadUrl = QString::null;
+    QString m_packageName = QString::null;
+    Download* m_download = nullptr;
+    Manager* m_manager = nullptr;
+    int m_progress = 0;
+>>>>>>> MERGE-SOURCE
 
     void startService();
     QString getPkconCommand();

=== modified file 'plugins/system-update/network/network.cpp'
--- plugins/system-update/network/network.cpp	2014-09-30 14:40:53 +0000
+++ plugins/system-update/network/network.cpp	2015-02-27 05:54:50 +0000
@@ -80,6 +80,7 @@
             return;
         }
 
+<<<<<<< TREE
         int httpStatus = statusAttr.toInt();
 
         if (httpStatus == 200 || httpStatus == 201) {
@@ -118,6 +119,44 @@
                             m_apps[name]->setDownloadSha512(download_sha512);
                             updates = true;
                         }
+=======
+        int httpStatus = statusAttr.toInt();
+
+        if (httpStatus == 200 || httpStatus == 201) {
+            if (reply->hasRawHeader(X_CLICK_TOKEN)) {
+                Update* app = qobject_cast<Update*>(
+                            reply->request().originatingObject());
+                if (app != nullptr) {
+                    QString header(reply->rawHeader(X_CLICK_TOKEN));
+                    Q_EMIT clickTokenObtained(app, header);
+                }
+                reply->deleteLater();
+                return;
+            }
+
+            QByteArray payload = reply->readAll();
+            QJsonDocument document = QJsonDocument::fromJson(payload);
+
+            RequestObject* state = qobject_cast<RequestObject*>(reply->request().originatingObject());
+            if (state != nullptr && state->operation.contains(APPS_DATA) && document.isArray()) {
+                QJsonArray array = document.array();
+                bool updates = false;
+                for (int i = 0; i < array.size(); i++) {
+                    QJsonObject object = array.at(i).toObject();
+                    QString name = object.value("name").toString();
+                    QString version = object.value("version").toString();
+                    QString icon_url = object.value("icon_url").toString();
+                    QString url = object.value("download_url").toString();
+                    int size = object.value("binary_filesize").toVariant().toInt();
+                    if (m_apps.contains(name)) {
+                        m_apps[name]->setRemoteVersion(version);
+                        if (m_apps[name]->updateRequired()) {
+                            m_apps[name]->setIconUrl(icon_url);
+                            m_apps[name]->setDownloadUrl(url);
+                            m_apps[name]->setBinaryFilesize(size);
+                            updates = true;
+                        }
+>>>>>>> MERGE-SOURCE
                     }
                 }
                 if (updates) {

=== modified file 'plugins/system-update/update.cpp'
=== modified file 'plugins/system-update/update.h'
=== modified file 'plugins/system-update/update_manager.cpp'
=== modified file 'plugins/system-update/update_manager.h'
=== modified file 'plugins/time-date/timedate.cpp'
=== modified file 'plugins/wifi/NetworkDetails.qml'
--- plugins/wifi/NetworkDetails.qml	2015-01-20 14:11:24 +0000
+++ plugins/wifi/NetworkDetails.qml	2015-02-27 05:54:50 +0000
@@ -84,8 +84,13 @@
         ListItem.Divider {}
 
         Button {
+<<<<<<< TREE
             objectName: "forgetNetwork"
             text : i18n.tr("Forget this network")
+=======
+            objectName: "forgetNetwork"
+            text : i18n.tr("Forget network")
+>>>>>>> MERGE-SOURCE
             anchors {
                 left: parent.left
                 right: parent.right

=== modified file 'plugins/wifi/NetworkDetailsBrief.qml'
--- plugins/wifi/NetworkDetailsBrief.qml	2015-01-20 14:11:24 +0000
+++ plugins/wifi/NetworkDetailsBrief.qml	2015-02-27 05:54:50 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 /*
  * This file is part of system-settings
  *
@@ -77,3 +78,84 @@
         }
     }
 }
+=======
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Jonas G. Drange <[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 QtQuick 2.0
+import QtQuick.Layouts 1.1
+import SystemSettings 1.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.SystemSettings.Wifi 1.0
+
+ItemPage {
+
+    property string networkName
+    property var accessPoint
+
+    title: networkName
+
+    Column {
+
+        anchors.fill: parent
+
+        ListItem.Divider {}
+
+        Button {
+            text : i18n.tr("Forget network")
+            anchors {
+                left: parent.left
+                right: parent.right
+                margins: units.gu(2)
+            }
+            onClicked: {
+                if (DbusHelper.forgetActiveDevice()) {
+                    accessPoint.checked = false;
+                    accessPoint.checkedChanged(false)
+                }
+
+            }
+        }
+
+        ListItem.Standard {
+            text: i18n.tr("IP address")
+            id: addressItem
+            control: TextField {
+                text: DbusHelper.wifiIp4Address
+                readOnly: true
+                horizontalAlignment: TextInput.AlignRight
+                width: addressItem.width/2
+                persistentSelection: true
+                font.pixelSize: units.dp(16)
+                font.weight: Font.Light
+                font.family: "Ubuntu"
+                color: "#AAAAAA"
+                maximumLength: 20
+                focus: true
+                clip: true
+                opacity: 0.9
+                cursorVisible: false
+                hasClearButton: false
+            }
+        }
+    }
+}
+>>>>>>> MERGE-SOURCE

=== modified file 'plugins/wifi/OtherNetwork.qml'
--- plugins/wifi/OtherNetwork.qml	2015-01-09 08:47:53 +0000
+++ plugins/wifi/OtherNetwork.qml	2015-02-27 05:54:50 +0000
@@ -23,122 +23,286 @@
 import Ubuntu.SystemSettings.Wifi 1.0
 import QMenuModel 0.1
 
-Component {
-
-    Dialog {
-
-        id: otherNetworkDialog
-        objectName: "otherNetworkDialog"
-        anchorToKeyboard: true
-
-        function settingsValid() {
-            if(networkname.length == 0) {
-                return false;
-            }
-            if(securityList.selectedIndex == 0) {
-                return true
-            }
-            if(securityList.selectedIndex == 1) {
-                return password.length >= 8
-            }
-            // WEP
-            return password.length === 5  ||
-                   password.length === 10 ||
-                   password.length === 13 ||
-                   password.length === 26;
-        }
-
-        title: i18n.tr("Connect to Hidden Network")
-        text: feedback.enabled ? feedback.text : "";
-
-        Common {
-            id: common
-        }
-
-        states: [
-            State {
-                name: "CONNECTING"
-                PropertyChanges {
-                    target: connectAction
-                    enabled: false
-                }
-                PropertyChanges {
-                    target: connectButtonIndicator
-                    running: true
-                }
-                PropertyChanges {
-                    target: passwordVisibleSwitch
-                    enabled: false
-                }
-                PropertyChanges {
-                    target: passwordVisibleLabel
-                    opacity: 0.5
-                }
-                PropertyChanges {
-                    target: password
-                    enabled: false
-                }
-                PropertyChanges {
-                    target: passwordListLabel
-                    opacity: 0.5
-                }
-                PropertyChanges {
-                    target: securityList
-                    enabled: false
-                    opacity: 0.5
-                }
-                PropertyChanges {
-                    target: securityListLabel
-                    opacity: 0.5
-                }
-                PropertyChanges {
-                    target: networkname
-                    enabled: false
-                }
-                PropertyChanges {
-                    target: networknameLabel
-                    opacity: 0.5
-                }
-                PropertyChanges {
-                    target: feedback
-                    enabled: true
-                }
-            },
-            State {
-                name: "FAILED"
-                PropertyChanges {
-                    target: feedback
-                    enabled: true
-                }
-            },
-            State {
-                name: "SUCCEEDED"
-                PropertyChanges {
-                    target: successIndicator
-                    running: true
-                }
-                PropertyChanges {
-                    target: cancelButton
-                    enabled: false
-                }
-                PropertyChanges {
-                    target: connectAction
-                    enabled: false
-                }
-            }
-        ]
-
-        Label {
-            property bool enabled: false
-            id: feedback
-            horizontalAlignment: Text.AlignHCenter
-            height: contentHeight
-            wrapMode: Text.Wrap
-            visible: false
-        }
-
-        Label {
-            id: networknameLabel
+<<<<<<< TREE
+Component {
+
+    Dialog {
+
+        id: otherNetworkDialog
+        objectName: "otherNetworkDialog"
+        anchorToKeyboard: true
+
+        function settingsValid() {
+            if(networkname.length == 0) {
+                return false;
+            }
+            if(securityList.selectedIndex == 0) {
+                return true
+            }
+            if(securityList.selectedIndex == 1) {
+                return password.length >= 8
+            }
+            // WEP
+            return password.length === 5  ||
+                   password.length === 10 ||
+                   password.length === 13 ||
+                   password.length === 26;
+        }
+
+        title: i18n.tr("Connect to Hidden Network")
+        text: feedback.enabled ? feedback.text : "";
+
+        Common {
+            id: common
+        }
+
+        states: [
+            State {
+                name: "CONNECTING"
+                PropertyChanges {
+                    target: connectAction
+                    enabled: false
+                }
+                PropertyChanges {
+                    target: connectButtonIndicator
+                    running: true
+                }
+                PropertyChanges {
+                    target: passwordVisibleSwitch
+                    enabled: false
+                }
+                PropertyChanges {
+                    target: passwordVisibleLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: password
+                    enabled: false
+                }
+                PropertyChanges {
+                    target: passwordListLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: securityList
+                    enabled: false
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: securityListLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: networkname
+                    enabled: false
+                }
+                PropertyChanges {
+                    target: networknameLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: feedback
+                    enabled: true
+                }
+            },
+            State {
+                name: "FAILED"
+                PropertyChanges {
+                    target: feedback
+                    enabled: true
+                }
+            },
+            State {
+                name: "SUCCEEDED"
+                PropertyChanges {
+                    target: successIndicator
+                    running: true
+                }
+                PropertyChanges {
+                    target: cancelButton
+                    enabled: false
+                }
+                PropertyChanges {
+                    target: connectAction
+                    enabled: false
+                }
+            }
+        ]
+
+        Label {
+            property bool enabled: false
+            id: feedback
+            horizontalAlignment: Text.AlignHCenter
+            height: contentHeight
+            wrapMode: Text.Wrap
+            visible: false
+        }
+
+        Label {
+            id: networknameLabel
+=======
+Component {
+
+    Dialog {
+
+        id: otherNetworkDialog
+        objectName: "otherNetworkDialog"
+        anchorToKeyboard: true
+
+        /* The following is a (bad) workaround for bugs
+            #1337556
+            #1337555
+
+            If the Dialog does not shrink after a user chooses e.g. WPA,
+            the anchorToKeyboard setting of OrientationHelper have no effect,
+            since the dialog never shrinks in size.
+
+            This workaround resizes the Dialog.
+        */
+
+        property int dialogVisualsHeight
+        function getVisibleChildren () {
+            var children = [feedback, networknameLabel, networkname,
+                securityListLabel, securityList, passwordListLabel,
+                password, passwordVisiblityRow, buttonRow];
+            var ret = [];
+            children.forEach(function (child) {
+                if (child.visible) {
+                    ret.push(child);
+                }
+            });
+            return ret;
+        }
+
+        function getVisibleChildrenHeight () {
+            var h = 0;
+            getVisibleChildren().forEach(function (child) {
+                h = h + child.height;
+            });
+            return h;
+        }
+
+        Component.onCompleted: {
+            dialogVisualsHeight =
+                __foreground.height - getVisibleChildrenHeight();
+        }
+
+        Binding {
+            target: __foreground
+            property: "height"
+            value: dialogVisualsHeight + getVisibleChildrenHeight()
+            when: dialogVisualsHeight
+        }
+
+        function settingsValid() {
+            if(networkname.length == 0) {
+                return false;
+            }
+            if(securityList.selectedIndex == 0) {
+                return true
+            }
+            if(securityList.selectedIndex == 1) {
+                return password.length >= 8
+            }
+            // WEP
+            return password.length === 5  ||
+                   password.length === 10 ||
+                   password.length === 13 ||
+                   password.length === 26;
+        }
+
+        title: i18n.tr("Connect to Hidden Network")
+        text: feedback.enabled ? feedback.text : "";
+
+        Common {
+            id: common
+        }
+
+        states: [
+            State {
+                name: "CONNECTING"
+                PropertyChanges {
+                    target: connectAction
+                    enabled: false
+                }
+                PropertyChanges {
+                    target: connectButtonIndicator
+                    running: true
+                }
+                PropertyChanges {
+                    target: passwordVisibleSwitch
+                    enabled: false
+                }
+                PropertyChanges {
+                    target: passwordVisibleLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: password
+                    enabled: false
+                }
+                PropertyChanges {
+                    target: passwordListLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: securityList
+                    enabled: false
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: securityListLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: networkname
+                    enabled: false
+                }
+                PropertyChanges {
+                    target: networknameLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: feedback
+                    enabled: true
+                }
+            },
+            State {
+                name: "FAILED"
+                PropertyChanges {
+                    target: feedback
+                    enabled: true
+                }
+            },
+            State {
+                name: "SUCCEEDED"
+                PropertyChanges {
+                    target: successIndicator
+                    running: true
+                }
+                PropertyChanges {
+                    target: cancelButton
+                    enabled: false
+                }
+                PropertyChanges {
+                    target: connectAction
+                    enabled: false
+                }
+            }
+        ]
+
+        Label {
+            property bool enabled: false
+            id: feedback
+            horizontalAlignment: Text.AlignHCenter
+            height: contentHeight
+            wrapMode: Text.Wrap
+            visible: false
+        }
+
+        Label {
+            id: networknameLabel
+>>>>>>> MERGE-SOURCE
             text : i18n.tr("Network name")
             objectName: "networknameLabel"
             fontSize: "medium"
@@ -149,6 +313,7 @@
 
         TextField {
             id : networkname
+<<<<<<< TREE
             objectName: "networkname"
             inputMethodHints: Qt.ImhNoPredictiveText
             Component.onCompleted: forceActiveFocus()
@@ -162,6 +327,20 @@
             font.bold: true
             color: Theme.palette.selected.backgroundText
             elide: Text.ElideRight
+=======
+            objectName: "networkname"
+            inputMethodHints: Qt.ImhNoPredictiveText
+        }
+
+        Label {
+            id: securityListLabel
+            text : i18n.tr("Security")
+            objectName: "securityListLabel"
+            fontSize: "medium"
+            font.bold: true
+            color: Theme.palette.selected.backgroundText
+            elide: Text.ElideRight
+>>>>>>> MERGE-SOURCE
         }
 
         ListItem.ItemSelector {
@@ -188,12 +367,22 @@
             id : password
             objectName: "password"
             visible: securityList.selectedIndex !== 0
+<<<<<<< TREE
             echoMode: passwordVisibleSwitch.checked ?
                 TextInput.Normal : TextInput.Password
             inputMethodHints: Qt.ImhNoPredictiveText
             onAccepted: {
                 connectAction.trigger();
             }
+=======
+            echoMode: passwordVisibleSwitch.checked ?
+                TextInput.Normal : TextInput.Password
+            inputMethodHints: passwordVisibleSwitch.checked ?
+                Qt.ImhHiddenText : Qt.ImhNoPredictiveText;
+            onAccepted: {
+                connectAction.trigger();
+            }
+>>>>>>> MERGE-SOURCE
         }
 
         Row {
@@ -204,6 +393,7 @@
 
             CheckBox {
                 id: passwordVisibleSwitch
+<<<<<<< TREE
                 activeFocusOnPress: false
             }
 
@@ -284,6 +474,87 @@
 
         Action {
             id: connectAction
+=======
+            }
+
+            Label {
+                id: passwordVisibleLabel
+                text : i18n.tr("Show password")
+                objectName: "passwordVisibleLabel"
+                fontSize: "medium"
+                color: Theme.palette.selected.backgroundText
+                elide: Text.ElideRight
+                height: passwordVisibleSwitch.height
+                verticalAlignment: Text.AlignVCenter
+                MouseArea {
+                    anchors {
+                        fill: parent
+                    }
+                    onClicked: {
+                        passwordVisibleSwitch.checked =
+                            !passwordVisibleSwitch.checked
+                    }
+                }
+            }
+        }
+
+        RowLayout {
+            id: buttonRow
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            spacing: units.gu(2)
+            height: cancelButton.height
+
+            Button {
+                id: cancelButton
+                objectName: "cancel"
+                Layout.fillWidth: true
+                text: i18n.tr("Cancel")
+                onClicked: {
+                    PopupUtils.close(otherNetworkDialog);
+
+                    // If this dialog created the connection,
+                    // disconnect the device
+                    if (otherNetworkDialog.state === "CONNECTING") {
+                        DbusHelper.forgetActiveDevice();
+                    }
+                }
+            }
+
+            Button {
+                id: connectButton
+                objectName: "connect"
+                Layout.fillWidth: true
+                text: i18n.tr("Connect")
+                enabled: connectAction.enabled
+                action: connectAction
+                Icon {
+                    height: parent.height - units.gu(1.5)
+                    width: parent.height - units.gu(1.5)
+                    anchors {
+                        centerIn: parent
+                    }
+                    name: "tick"
+                    color: "green"
+                    visible: successIndicator.running
+                }
+                ActivityIndicator {
+                    id: connectButtonIndicator
+                    running: false
+                    visible: running
+                    height: parent.height - units.gu(1.5)
+                    anchors {
+                        centerIn: parent
+                    }
+                }
+            }
+        }
+
+        Action {
+            id: connectAction
+>>>>>>> MERGE-SOURCE
             enabled: settingsValid()
             onTriggered: {
                 DbusHelper.connect(

=== modified file 'plugins/wifi/PageComponent.qml'
--- plugins/wifi/PageComponent.qml	2014-11-06 13:59:50 +0000
+++ plugins/wifi/PageComponent.qml	2015-02-27 05:54:50 +0000
@@ -135,6 +135,7 @@
             }
 
             ListItem.SingleValue {
+<<<<<<< TREE
                 objectName: "connectToHiddenNetwork"
                 text: i18n.tr("Connect to hidden network…")
                 visible : (actionGroup.actionObject.valid ?
@@ -149,6 +150,21 @@
                 id: otherNetworLoader
                 asynchronous: false
             }
+=======
+                objectName: "connectToHiddenNetwork"
+                text: i18n.tr("Connect to hidden network…")
+                progression: true
+                onClicked: {
+                    otherNetworLoader.source = "OtherNetwork.qml";
+                    PopupUtils.open(otherNetworLoader.item);
+                }
+            }
+
+            Loader {
+                id: otherNetworLoader
+                asynchronous: false
+            }
+>>>>>>> MERGE-SOURCE
         }
 
         // Only allow flicking if the content doesn't fit on the page
@@ -156,4 +172,5 @@
                             Flickable.DragAndOvershootBounds :
                             Flickable.StopAtBounds
     }
+
 }

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2015-02-09 15:43:08 +0000
+++ po/CMakeLists.txt	2015-02-27 05:54:50 +0000
@@ -42,7 +42,11 @@
                             --copyright=\"Canonical Ltd.\"
                             --package-name ubuntu-system-settings
                             --qt --c++ --add-comments=TRANSLATORS
+<<<<<<< TREE
                             --keyword=QT_TR_NOOP --keyword=ctr:1c,2
+=======
+                            --keyword=QT_TR_NOOP --keyword=qsTr:1,2c
+>>>>>>> MERGE-SOURCE
                             --keyword=tr --keyword=tr:1,2 --from-code=UTF-8
                             ${QMLFILES} "${CMAKE_CURRENT_BINARY_DIR}/settings.js"
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"

=== modified file 'po/am.po'
--- po/am.po	2015-02-03 08:00:24 +0000
+++ po/am.po	2015-02-27 05:54:50 +0000
@@ -7,14 +7,20 @@
 msgstr ""
 "Project-Id-Version: ubuntu-system-settings\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2014-10-16 20:04-0600\n"
 "PO-Revision-Date: 2015-02-01 01:19+0000\n"
+=======
+"POT-Creation-Date: 2014-10-16 20:04-0600\n"
+"PO-Revision-Date: 2014-10-22 23:31+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: samson <Unknown>\n"
 "Language-Team: Amharic <[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"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2015-02-03 08:00+0000\n"
 "X-Generator: Launchpad (build 17330)\n"
 
@@ -31,9 +37,28 @@
 msgstr "ምርጫዎች: ማሰናጃዎች:"
 
 #: ../plugins/background//Preview.qml:70
+=======
+"X-Launchpad-Export-Date: 2014-10-24 06:38+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
+
+#: ubuntu-system-settings.desktop.in.in.h:1 ../src/qml/MainWindow.qml:112
+msgid "System Settings"
+msgstr "ስርአት ማሰናጃ"
+
+#: ubuntu-system-settings.desktop.in.in.h:2
+msgid "System;"
+msgstr "ስርአት:"
+
+#: ubuntu-system-settings.desktop.in.in.h:3
+msgid "Preferences;Settings;"
+msgstr "ምርጫዎች: ማሰናጃዎች:"
+
+#: ../plugins/background//Preview.qml:70
+>>>>>>> MERGE-SOURCE
 msgid "Preview"
 msgstr "ቅድመ እይታ"
 
+<<<<<<< TREE
 #: ../plugins/background//Preview.qml:102
 msgid "Remove image"
 msgstr "ምስል ማስወገጃ"
@@ -58,19 +83,59 @@
 #: ../plugins/security-privacy//SimPin.qml:268
 #: ../plugins/background//Components//AddRemove.qml:42
 #: ../plugins/cellular//Components//SimEditor.qml:204
+=======
+#: ../plugins/background//Preview.qml:102
+msgid "Remove image"
+msgstr "ምስል ማስወገጃ"
+
+#: ../plugins/background//Preview.qml:102
+#: ../plugins/wifi//OtherNetwork.qml:288
+#: ../plugins/reset//ResetAllSettings.qml:38
+#: ../plugins/reset//ResetLauncherHome.qml:55
+#: ../plugins/reset//EraseEverything.qml:54
+#: ../plugins/language//RebootNecessary.qml:47
+#: ../plugins/language//DisplayLanguage.qml:98
+#: ../plugins/phone//CallForwarding.qml:139
+#: ../plugins/cellular//PageChooseApn.qml:594
+#: ../plugins/cellular//CustomApnEditor.qml:245
+#: ../plugins/cellular//HotspotSetup.qml:85
+#: ../plugins/security-privacy//LockSecurity.qml:283
+#: ../plugins/security-privacy//SimPin.qml:149
+#: ../plugins/security-privacy//SimPin.qml:266
+#: ../plugins/bluetooth//ProvidePasskeyDialog.qml:54
+#: ../plugins/bluetooth//ConfirmPasskeyDialog.qml:49
+#: ../plugins/bluetooth//ProvidePinCodeDialog.qml:55
+#: ../plugins/time-date//TimePicker.qml:173
+#: ../plugins/background//Components//AddRemove.qml:42
+#: ../plugins/cellular//Components//SimEditor.qml:189
+>>>>>>> MERGE-SOURCE
 msgid "Cancel"
 msgstr "መሰረዣ"
 
-#: ../plugins/background//Preview.qml:109
+<<<<<<< TREE
+#: ../plugins/background//Preview.qml:109
+=======
+#: ../plugins/background//Preview.qml:109
+#: ../plugins/phone//CallForwarding.qml:152
+#: ../plugins/security-privacy//LockSecurity.qml:304
+>>>>>>> MERGE-SOURCE
 #: ../plugins/time-date//TimePicker.qml:182
+<<<<<<< TREE
 #: ../plugins/phone//CallForwarding.qml:152
 #: ../plugins/security-privacy//LockSecurity.qml:354
+=======
+>>>>>>> MERGE-SOURCE
 msgid "Set"
 msgstr "ማሰናጃ"
 
 #. TRANSLATORS: This is a keyword or name for the background plugin which is used while searching
+<<<<<<< TREE
 #: ../plugins/background//MainPage.qml:35
 #: /build/buildd/ubuntu-system-settings-0.3+15.04.20150129.2/obj-i686-linux-gnu/po/settings.js:8
+=======
+#: ../plugins/background//MainPage.qml:35
+#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:2
+>>>>>>> MERGE-SOURCE
 msgid "Background"
 msgstr "መደቡ"
 
@@ -83,6 +148,7 @@
 #: ../plugins/cellular//PageChooseApn.qml:488
 #: ../plugins/cellular//PageChooseApn.qml:496
 msgid "Custom"
+<<<<<<< TREE
 msgstr "የተለመደ"
 
 #: ../plugins/wifi//RemoveBackground.qml:28
@@ -224,9 +290,154 @@
 msgstr ""
 
 #: ../plugins/bluetooth//PageComponent.qml:87 ../plugins/wifi//Common.qml:96
+=======
+msgstr ""
+
+#: ../plugins/wifi//RemoveBackground.qml:28
+msgid "Clear"
+msgstr "ማጽጃ"
+
+#: ../plugins/wifi//NetworkDetailsBrief.qml:42
+#: ../plugins/bluetooth//PageComponent.qml:411
+msgid "Disconnect"
+msgstr "ማቋረጫ"
+
+#: ../plugins/wifi//NetworkDetailsBrief.qml:58
+msgid "IP address"
+msgstr "IP አድራሻ"
+
+#: ../plugins/wifi//PreviousNetworks.qml:27
+#: ../plugins/wifi//PageComponent.qml:132
+msgid "Previous networks"
+msgstr "ቀደም ያሉ ኔትዎርኮች"
+
+#: ../plugins/wifi//Common.qml:36
+msgid "Unknown error"
+msgstr "ያልታወቀ ስህተት"
+
+#: ../plugins/wifi//Common.qml:38
+msgid "No reason given"
+msgstr "ምንም ምክንያት አልተሰጠም"
+
+#: ../plugins/wifi//Common.qml:40
+msgid "Device is now managed"
+msgstr "አካሉ አሁን በ አስተዳዳሪው ቁጥጥር ውስጥ ነው"
+
+#: ../plugins/wifi//Common.qml:42
+msgid "Device is now unmanaged"
+msgstr "አካሉ አሁን በ አስተዳዳሪው ቁጥጥር ውስጥ አይደለም"
+
+#: ../plugins/wifi//Common.qml:44
+msgid "The device could not be readied for configuration"
+msgstr "ለማዋቀር አካሉን ማዘጋጀት አልተቻለም"
+
+#: ../plugins/wifi//Common.qml:46
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc.)"
+msgstr ""
+
+#: ../plugins/wifi//Common.qml:48
+msgid "The IP configuration is no longer valid"
+msgstr ""
+
+#: ../plugins/wifi//Common.qml:50
+msgid "Your authentication details were incorrect"
+msgstr "የ እርስዎ ማረጋገጫ ዝርዝር ትክክል አይደለም"
+
+#: ../plugins/wifi//Common.qml:52
+msgid "802.1X supplicant disconnected"
+msgstr ""
+
+#: ../plugins/wifi//Common.qml:54
+msgid "802.1X supplicant configuration failed"
+msgstr ""
+
+#: ../plugins/wifi//Common.qml:56
+msgid "802.1X supplicant failed"
+msgstr ""
+
+#: ../plugins/wifi//Common.qml:58
+msgid "802.1X supplicant took too long to authenticate"
+msgstr ""
+
+#: ../plugins/wifi//Common.qml:60
+msgid "DHCP client failed to start"
+msgstr "የ DHCP ደንበኛ ማስጀመር አልተቻለም"
+
+#: ../plugins/wifi//Common.qml:62
+msgid "DHCP client error"
+msgstr "የ DHCP ደንበኛ ስህተት"
+
+#: ../plugins/wifi//Common.qml:64
+msgid "DHCP client failed"
+msgstr "የ DHCP ደንበኛ ወድቋል"
+
+#: ../plugins/wifi//Common.qml:66
+msgid "Shared connection service failed to start"
+msgstr "የሚጋሩትን የ ግንኙነት ግልጋሎት ማስጀመር አልተቻለም"
+
+#: ../plugins/wifi//Common.qml:68
+msgid "Shared connection service failed"
+msgstr "የሚጋሩት የ ግንኙነት ግልጋሎት ወድቋል"
+
+#: ../plugins/wifi//Common.qml:70
+msgid "Necessary firmware for the device may be missing"
+msgstr ""
+
+#: ../plugins/wifi//Common.qml:72
+msgid "The device was removed"
+msgstr "አካሉ ተወግዷል"
+
+#: ../plugins/wifi//Common.qml:74
+msgid "NetworkManager went to sleep"
+msgstr "የ ኔትዎርክ አስተዳዳሪ ተኝቷል"
+
+#: ../plugins/wifi//Common.qml:76
+msgid "The device's active connection disappeared"
+msgstr "የ አካሉ ንቁ ግንኙነት ጠፍቷል"
+
+#: ../plugins/wifi//Common.qml:78
+msgid "Device disconnected by user or client"
+msgstr "አካሉ በ ተጠቃሚው ወይንም በ ደንበኛው ተለያይቷል"
+
+#: ../plugins/wifi//Common.qml:80
+msgid "The device's existing connection was assumed"
+msgstr ""
+
+#: ../plugins/wifi//Common.qml:82
+msgid "The supplicant is now available"
+msgstr ""
+
+#: ../plugins/wifi//Common.qml:84
+msgid "The modem could not be found"
+msgstr "ሞደም ማግኘት አልተቻለም"
+
+#: ../plugins/wifi//Common.qml:86
+msgid "The Bluetooth connection failed or timed out"
+msgstr "የ ብሉቱዝ ግንኙነት ወድቋል ወይንም ጊዜው አልፏል"
+
+#: ../plugins/wifi//Common.qml:88
+msgid "A dependency of the connection failed"
+msgstr ""
+
+#: ../plugins/wifi//Common.qml:90
+msgid "ModemManager is unavailable"
+msgstr "የ ሞደም አስተዳዳሪ አልተገኘም"
+
+#: ../plugins/wifi//Common.qml:92
+msgid "The Wi-Fi network could not be found"
+msgstr "የ ዋይ-ፋይ ኔትዎርክ አልተገኘም"
+
+#: ../plugins/wifi//Common.qml:94
+msgid "A secondary connection of the base connection failed"
+msgstr ""
+
+#: ../plugins/wifi//Common.qml:96 ../plugins/bluetooth//PageComponent.qml:86
+>>>>>>> MERGE-SOURCE
 msgid "Unknown"
 msgstr "ያልታወቀ"
 
+<<<<<<< TREE
 #: ../plugins/wifi//OtherNetwork.qml:51
 msgid "Connect to Hidden Network"
 msgstr "ከ ተደበቀ ኔትዎርክ ጋር መገናኛ"
@@ -294,9 +505,73 @@
 
 #: ../plugins/bluetooth//PageComponent.qml:346
 #: ../plugins/wifi//NetworkDetails.qml:45
+=======
+#: ../plugins/wifi//OtherNetwork.qml:96
+msgid "Connect to Hidden Network"
+msgstr "ከ ተደበቀ ኔትዎርክ ጋር መገናኛ"
+
+#: ../plugins/wifi//OtherNetwork.qml:187
+msgid "Network name"
+msgstr "የ ኔትዎርክ ስም"
+
+#: ../plugins/wifi//OtherNetwork.qml:203
+#: ../plugins/security-privacy//PageComponent.qml:126
+msgid "Security"
+msgstr "ደህንነት"
+
+#: ../plugins/wifi//OtherNetwork.qml:214
+#: ../plugins/bluetooth//PageComponent.qml:116
+#: ../plugins/bluetooth//PageComponent.qml:326
+#: ../plugins/bluetooth//PageComponent.qml:347
+msgid "None"
+msgstr "ምንም"
+
+#: ../plugins/wifi//OtherNetwork.qml:215
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 የግል"
+
+#: ../plugins/wifi//OtherNetwork.qml:216
+msgid "WEP"
+msgstr "WEP"
+
+#: ../plugins/wifi//OtherNetwork.qml:222
+#: ../plugins/wifi//NetworkDetails.qml:64
+#: ../plugins/cellular//CustomApnEditor.qml:222
+msgid "Password"
+msgstr "የመግቢያ ቃል"
+
+#: ../plugins/wifi//OtherNetwork.qml:256
+#: ../plugins/wifi//NetworkDetails.qml:77
+msgid "Show password"
+msgstr "የመግቢያ ቃል ማሳያ"
+
+#: ../plugins/wifi//OtherNetwork.qml:304
+#: ../plugins/bluetooth//PageComponent.qml:411
+msgid "Connect"
+msgstr "መገናኛ"
+
+#. TRANSLATORS: This is a keyword or name for the wifi plugin which is used while searching
+#: ../plugins/wifi//PageComponent.qml:28
+#: ../plugins/battery//PageComponent.qml:333
+#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:24
+msgid "Wi-Fi"
+msgstr "ዋይ-ፋይ"
+
+#: ../plugins/wifi//PageComponent.qml:139
+msgid "Connect to hidden network…"
+msgstr "ከ ተደበቀ ኔትዎርክ ጋር መገናኛ…"
+
+#: ../plugins/wifi//NetworkDetails.qml:38
+msgid "Network details"
+msgstr "የ ኔትዎርክ ዝርዝር"
+
+#: ../plugins/wifi//NetworkDetails.qml:45
+#: ../plugins/bluetooth//PageComponent.qml:346
+>>>>>>> MERGE-SOURCE
 msgid "Name"
 msgstr "ስም"
 
+<<<<<<< TREE
 #: ../plugins/wifi//NetworkDetails.qml:53
 msgid "Last connected"
 msgstr "መጨረሻ የተገናኘው"
@@ -318,10 +593,36 @@
 #: ../plugins/wifi//NetworkDetailsBrief.qml:42
 msgid "Forget network"
 msgstr "ኔትዎርክን መተው"
+=======
+#: ../plugins/wifi//NetworkDetails.qml:53
+msgid "Last connected"
+msgstr "መጨረሻ የተገናኘው"
+
+#: ../plugins/wifi//NetworkDetails.qml:58
+#: ../plugins/battery//PageComponent.qml:315
+#: ../plugins/battery//PageComponent.qml:324
+#: ../plugins/battery//SleepValues.qml:106
+#: ../plugins/security-privacy//PhoneLocking.qml:78
+#: ../plugins/security-privacy//PhoneLocking.qml:87
+#: ../plugins/security-privacy//PageComponent.qml:140
+#: ../plugins/about//PageComponent.qml:167
+#: ../plugins/system-update//PageComponent.qml:762
+#: ../plugins/system-update//Configuration.qml:52
+msgid "Never"
+msgstr "በፍጹም"
+
+#: ../plugins/wifi//NetworkDetails.qml:88
+msgid "Forget network"
+msgstr "ኔትዎርክን መተው"
+>>>>>>> MERGE-SOURCE
 
 #. TRANSLATORS: This is a keyword or name for the notifications plugin which is used while searching
 #: ../plugins/notifications//PageComponent.qml:29
+<<<<<<< TREE
 #: /build/buildd/ubuntu-system-settings-0.3+15.04.20150129.2/obj-i686-linux-gnu/po/settings.js:296
+=======
+#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:44
+>>>>>>> MERGE-SOURCE
 msgid "Notifications"
 msgstr "ማስታወቂያዎች"
 
@@ -331,73 +632,142 @@
 "and the Notification Center."
 msgstr ""
 
+<<<<<<< TREE
 #: ../plugins/sound//SoundsList.qml:70
 msgid "Stop playing"
 msgstr "ጨዋታውን ማስቆሚያ"
+=======
+#: ../plugins/sound//SoundsList.qml:60
+msgid "Stop playing"
+msgstr "ጨዋታውን ማስቆሚያ"
+>>>>>>> MERGE-SOURCE
 
 #. TRANSLATORS: This is a keyword or name for the sound plugin which is used while searching
+<<<<<<< TREE
 #: ../plugins/sound//PageComponent.qml:37
 #: /build/buildd/ubuntu-system-settings-0.3+15.04.20150129.2/obj-i686-linux-gnu/po/settings.js:132
+=======
+#: ../plugins/sound//PageComponent.qml:37
+#: /home/elopio/workspace/canonical/ubuntu-system-settings/experimental/update-pot/builddir/po/settings.js:68
+>>>>>>> MERGE-SOURCE
 msgid "Sound"
 msgstr "ድምፅ"
 
+<<<<<<< TREE
 #: ../plugins/sound//PageComponent.qml:77
+=======
+#: ../plugins/sound//PageComponent.qml:76
+>>>>>>> MERGE-SOURCE
 msgid "Silent Mode"
 msgstr "በ ዝምታ ዘዴ"