Merge lp:~ken-vandine/content-hub/out_of_process_picker into lp:content-hub

[Ken VanDine]

Out of process peer picker

Out of process peer picker

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:314
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/74/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1919/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1920
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1759
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1759/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1759/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1759
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1759/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1759
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1759/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1759
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1759/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1759
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1759/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1759
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1759/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1759/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1759/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/74/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/content-hub/out_of_process_picker]

315. By Ken VanDine on 2016-11-01

peer picker improvements

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:315
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/75/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1922/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1923
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1762
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1762/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1762/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1762/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1762
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1762/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1762
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1762/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1762
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1762/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1762
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1762/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1762
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1762/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1762/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/75/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/content-hub/out_of_process_picker]

316. By Ken VanDine on 2016-11-04

Use button to request transfer

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:316
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/76/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1933/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1934
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1773
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1773/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1773/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1773/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1773
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1773/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1773
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1773/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1773
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1773/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1773
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1773/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1773
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1773/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1773/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/76/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

316. By Ken VanDine on 2016-11-04

Use button to request transfer

=== modified file 'debian/content-hub.install'
--- debian/content-hub.install	2015-10-16 17:34:01 +0000
+++ debian/content-hub.install	2016-11-04 14:22:30 +0000
@@ -1,3 +1,4 @@
+usr/bin/content-hub-peer-picker
 usr/bin/content-hub-send
 usr/bin/content-hub-service
 usr/lib/*/content-hub
@@ -6,5 +7,6 @@
 usr/share/glib-2.0/schemas
 usr/share/locale/*/LC_MESSAGES/content-hub.mo
 usr/share/applications/content-hub-send.desktop
+usr/share/applications/content-hub-peer-picker.desktop
 usr/share/url-dispatcher/urls/content-hub-send.url-dispatcher
 usr/share/content-hub/icons

=== modified file 'examples/importer/exampleimporter.cpp'
--- examples/importer/exampleimporter.cpp	2016-05-31 19:50:24 +0000
+++ examples/importer/exampleimporter.cpp	2016-11-04 14:22:30 +0000
@@ -23,6 +23,14 @@
 {
     auto hub = cuc::Hub::Client::instance();
     hub->register_import_export_handler(this);
+    QObject::connect(hub, SIGNAL(peerSelected(QString)),
+        this,
+        SLOT(onPeerSelected(QString)));
+}
+
+void ExampleImporter::onPeerSelected(QString peer_id)
+{
+    qDebug() << Q_FUNC_INFO << peer_id;
 }
 
 void ExampleImporter::handle_import(cuc::Transfer *transfer)

=== modified file 'examples/importer/exampleimporter.h'
--- examples/importer/exampleimporter.h	2016-05-31 19:50:24 +0000
+++ examples/importer/exampleimporter.h	2016-11-04 14:22:30 +0000
@@ -35,6 +35,7 @@
     Q_INVOKABLE void handle_import(cuc::Transfer*);
     Q_INVOKABLE void handle_export(cuc::Transfer*);    
     Q_INVOKABLE void handle_share(cuc::Transfer*);
+    Q_INVOKABLE void onPeerSelected(QString);
 };
 
 #endif // EXAMPLEIMPORTER_H

=== modified file 'examples/picker-qml/picker.qml'
--- examples/picker-qml/picker.qml	2014-03-16 11:12:16 +0000
+++ examples/picker-qml/picker.qml	2016-11-04 14:22:30 +0000
@@ -38,7 +38,7 @@
                     control: Button {
                         text: i18n.tr("Select source")
                         onClicked: {
-                            pageStack.push(picker);
+                            ContentHub.requestPeerForType(ContentType.Pictures, ContentHandler.Source);
                         }
                     }
                 }
@@ -105,21 +105,11 @@
             id: picker
             visible: false
 
-            ContentPeerPicker {
-                visible: parent.visible
-
-                // Type of handler: Source, Destination, or Share
-                handler: ContentHandler.Source
-                // well know content type
-                contentType: ContentType.Pictures
-
+            Connections {
+                target: ContentHub
                 onPeerSelected: {
+                    console.debug("onPeerSelected: " + peer);
                     root.activeTransfer = peer.request();
-                    pageStack.pop();
-                }
-
-                onCancelPressed: {
-                    pageStack.pop();
                 }
             }
         }

=== modified file 'import/Ubuntu/Content/contenthub.cpp'
--- import/Ubuntu/Content/contenthub.cpp	2015-08-21 14:49:38 +0000
+++ import/Ubuntu/Content/contenthub.cpp	2016-11-04 14:22:30 +0000
@@ -133,6 +133,23 @@
             this, SLOT(handleExport(com::ubuntu::content::Transfer*)));
     connect(m_handler, SIGNAL(shareRequested(com::ubuntu::content::Transfer*)),
             this, SLOT(handleShare(com::ubuntu::content::Transfer*)));
+    connect(m_hub, SIGNAL(peerSelected(QString)),
+        this,
+        SLOT(onPeerSelected(QString)));
+}
+
+void ContentHub::selectPeerForAppId(QString app_id, QString peer_id)
+{
+    TRACE() << Q_FUNC_INFO << app_id << peer_id;
+    m_hub->selectPeerForAppId(app_id, peer_id);
+}
+
+void ContentHub::onPeerSelected(QString peer_id)
+{
+    TRACE() << Q_FUNC_INFO << peer_id;
+    ContentPeer peer;
+    peer.setAppId(peer_id);
+    Q_EMIT(peerSelected(&peer));
 }
 
 ContentHub *ContentHub::instance()
@@ -316,6 +333,26 @@
 }
 
 /*!
+ * \brief ContentHub::requestPeerForType raises the peer picker
+ * peerSelected is emitted when a peer is selected in the peer picker
+ * \a type
+ */
+//void ContentHub::requestPeerForType(ContentType::Type contentType, ContentHandler::Handler handler)
+void ContentHub::requestPeerForType(int contentType, int handler)
+{
+    TRACE() << Q_FUNC_INFO;
+    const cuc::Type &hubType = ContentType::contentType2HubType(contentType);
+    QString handler_id;
+    if (handler == ContentHandler::Source)
+        handler_id = "source";
+    else if (handler == ContentHandler::Share)
+        handler_id = "share";
+    else
+        handler_id = "destination";
+    m_hub->requestPeerForType(hubType, handler_id);
+}
+
+/*!
  * \qmlsignal ContentHub::importRequested(ContentTransfer transfer)
  *
  * The signal is triggered when an import is requested.
@@ -333,3 +370,9 @@
  * The signal is triggered when a share is requested.
  */
 
+/*!
+ * \qmlsignal ContentHub::peerSelected(QString peer_id)
+ *
+ * The signal is emitted when the user selects a peer.
+ */
+

=== modified file 'import/Ubuntu/Content/contenthub.h'
--- import/Ubuntu/Content/contenthub.h	2015-08-20 15:54:52 +0000
+++ import/Ubuntu/Content/contenthub.h	2016-11-04 14:22:30 +0000
@@ -21,6 +21,7 @@
 #include <QList>
 #include <QObject>
 #include <QQmlListProperty>
+#include "contenthandler.h"
 #include "contentpeer.h"
 #include "contenttransfer.h"
 
@@ -59,18 +60,23 @@
     Q_INVOKABLE ContentTransfer* exportContent(com::ubuntu::content::Peer peer, ContentType::Type type);
     Q_INVOKABLE ContentTransfer* shareContent(com::ubuntu::content::Peer peer, ContentType::Type type);
 
+    Q_INVOKABLE void requestPeerForType(int, int);
+    Q_INVOKABLE void selectPeerForAppId(QString, QString);
+
 Q_SIGNALS:
     void importRequested(ContentTransfer *transfer);
     void exportRequested(ContentTransfer *transfer);
     void shareRequested(ContentTransfer *transfer);
 
     void finishedImportsChanged();
+    void peerSelected(ContentPeer* peer);
 
 private Q_SLOTS:
     void handleImport(com::ubuntu::content::Transfer* transfer);
     void handleExport(com::ubuntu::content::Transfer* transfer);
     void handleShare(com::ubuntu::content::Transfer* transfer);
     void updateState();
+    void onPeerSelected(QString);
 
 private:
     QList<ContentTransfer *> m_finishedImports;

=== modified file 'include/com/ubuntu/content/hub.h'
--- include/com/ubuntu/content/hub.h	2016-08-24 20:23:44 +0000
+++ include/com/ubuntu/content/hub.h	2016-11-04 14:22:30 +0000
@@ -70,6 +70,8 @@
     Q_INVOKABLE virtual Transfer* create_share_to_peer_for_type(Peer peer, Type type);
     Q_INVOKABLE virtual bool has_pending(QString peer_id);
     Q_INVOKABLE virtual Peer peer_for_app_id(QString app_id);
+    Q_INVOKABLE virtual void requestPeerForType(Type type, QString handler_id);
+    Q_INVOKABLE virtual void selectPeerForAppId(QString app_id, QString peer_id);
 
     ///
     // Copy & Paste
@@ -90,9 +92,11 @@
   Q_SIGNALS:
     void pasteFormatsChanged();
     void pasteboardChanged();
+    void peerSelected(QString);
 
   private Q_SLOTS:
     void onPasteFormatsChanged(const QStringList &);
+    void onPeerSelected(const QString &, const QString &);
   protected:
     Hub(QObject* = nullptr);
 

=== modified file 'po/aa.po'
--- po/aa.po	2016-11-03 06:11:46 +0000
+++ po/aa.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/am.po'
--- po/am.po	2016-11-03 06:11:46 +0000
+++ po/am.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/ar.po'
--- po/ar.po	2016-11-03 06:11:46 +0000
+++ po/ar.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/ast.po'
--- po/ast.po	2016-11-03 06:11:46 +0000
+++ po/ast.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/az.po'
--- po/az.po	2016-11-03 06:11:46 +0000
+++ po/az.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/be.po'
--- po/be.po	2016-11-03 06:11:46 +0000
+++ po/be.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/bg.po'
--- po/bg.po	2016-11-03 06:11:46 +0000
+++ po/bg.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/br.po'
--- po/br.po	2016-11-03 06:11:46 +0000
+++ po/br.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/bs.po'
--- po/bs.po	2016-11-03 06:11:46 +0000
+++ po/bs.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/ca.po'
--- po/ca.po	2016-11-03 06:11:46 +0000
+++ po/ca.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/[e-mail]'
--- po/[e-mail]	2016-11-03 06:11:46 +0000
+++ po/[e-mail]	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/cs.po'
--- po/cs.po	2016-11-03 06:11:46 +0000
+++ po/cs.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/cy.po'
--- po/cy.po	2016-11-03 06:11:46 +0000
+++ po/cy.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/da.po'
--- po/da.po	2016-11-03 06:11:46 +0000
+++ po/da.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/de.po'
--- po/de.po	2016-11-03 06:11:46 +0000
+++ po/de.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/el.po'
--- po/el.po	2016-11-03 06:11:46 +0000
+++ po/el.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/en_AU.po'
--- po/en_AU.po	2016-11-03 06:11:46 +0000
+++ po/en_AU.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/en_GB.po'
--- po/en_GB.po	2016-11-03 06:11:46 +0000
+++ po/en_GB.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/eo.po'
--- po/eo.po	2016-11-03 06:11:46 +0000
+++ po/eo.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/es.po'
--- po/es.po	2016-11-03 06:11:46 +0000
+++ po/es.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/et.po'
--- po/et.po	2016-11-03 06:11:46 +0000
+++ po/et.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/eu.po'
--- po/eu.po	2016-11-03 06:11:46 +0000
+++ po/eu.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/fa.po'
--- po/fa.po	2016-11-03 06:11:46 +0000
+++ po/fa.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/fi.po'
--- po/fi.po	2016-11-03 06:11:46 +0000
+++ po/fi.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/fo.po'
--- po/fo.po	2016-11-03 06:11:46 +0000
+++ po/fo.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/fr.po'
--- po/fr.po	2016-11-03 06:11:46 +0000
+++ po/fr.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/fr_CA.po'
--- po/fr_CA.po	2016-11-03 06:11:46 +0000
+++ po/fr_CA.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/ga.po'
--- po/ga.po	2016-11-03 06:11:46 +0000
+++ po/ga.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/gd.po'
--- po/gd.po	2016-11-03 06:11:46 +0000
+++ po/gd.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 "Language: gd\n"
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48

=== modified file 'po/gl.po'
--- po/gl.po	2016-11-03 06:11:46 +0000
+++ po/gl.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/he.po'
--- po/he.po	2016-11-03 06:11:46 +0000
+++ po/he.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/hr.po'
--- po/hr.po	2016-11-03 06:11:46 +0000
+++ po/hr.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/hu.po'
--- po/hu.po	2016-11-03 06:11:46 +0000
+++ po/hu.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/ia.po'
--- po/ia.po	2016-11-03 06:11:46 +0000
+++ po/ia.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/id.po'
--- po/id.po	2016-11-03 06:11:46 +0000
+++ po/id.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/is.po'
--- po/is.po	2016-11-03 06:11:46 +0000
+++ po/is.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/it.po'
--- po/it.po	2016-11-03 06:11:46 +0000
+++ po/it.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/ja.po'
--- po/ja.po	2016-11-03 06:11:46 +0000
+++ po/ja.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/kk.po'
--- po/kk.po	2016-11-03 06:11:46 +0000
+++ po/kk.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/km.po'
--- po/km.po	2016-11-03 06:11:46 +0000
+++ po/km.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/kn.po'
--- po/kn.po	2016-11-03 06:11:46 +0000
+++ po/kn.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/ko.po'
--- po/ko.po	2016-11-03 06:11:46 +0000
+++ po/ko.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/lv.po'
--- po/lv.po	2016-11-03 06:11:46 +0000
+++ po/lv.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/ms.po'
--- po/ms.po	2016-11-03 06:11:46 +0000
+++ po/ms.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/my.po'
--- po/my.po	2016-11-03 06:11:46 +0000
+++ po/my.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/nb.po'
--- po/nb.po	2016-11-03 06:11:46 +0000
+++ po/nb.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/ne.po'
--- po/ne.po	2016-11-03 06:11:46 +0000
+++ po/ne.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/nl.po'
--- po/nl.po	2016-11-03 06:11:46 +0000
+++ po/nl.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/oc.po'
--- po/oc.po	2016-11-03 06:11:46 +0000
+++ po/oc.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/om.po'
--- po/om.po	2016-11-03 06:11:46 +0000
+++ po/om.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/pa.po'
--- po/pa.po	2016-11-03 06:11:46 +0000
+++ po/pa.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/pl.po'
--- po/pl.po	2016-11-03 06:11:46 +0000
+++ po/pl.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/pt.po'
--- po/pt.po	2016-11-03 06:11:46 +0000
+++ po/pt.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/pt_BR.po'
--- po/pt_BR.po	2016-11-03 06:11:46 +0000
+++ po/pt_BR.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/ro.po'
--- po/ro.po	2016-11-03 06:11:46 +0000
+++ po/ro.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/ru.po'
--- po/ru.po	2016-11-03 06:11:46 +0000
+++ po/ru.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/si.po'
--- po/si.po	2016-11-03 06:11:46 +0000
+++ po/si.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/sk.po'
--- po/sk.po	2016-11-03 06:11:46 +0000
+++ po/sk.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/sl.po'
--- po/sl.po	2016-11-03 06:11:46 +0000
+++ po/sl.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/sq.po'
--- po/sq.po	2016-11-03 06:11:46 +0000
+++ po/sq.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/sr.po'
--- po/sr.po	2016-11-03 06:11:46 +0000
+++ po/sr.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/sv.po'
--- po/sv.po	2016-11-03 06:11:46 +0000
+++ po/sv.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/ta.po'
--- po/ta.po	2016-11-03 06:11:46 +0000
+++ po/ta.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/th.po'
--- po/th.po	2016-11-03 06:11:46 +0000
+++ po/th.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/tr.po'
--- po/tr.po	2016-11-03 06:11:46 +0000
+++ po/tr.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/ug.po'
--- po/ug.po	2016-11-03 06:11:46 +0000
+++ po/ug.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/uk.po'
--- po/uk.po	2016-11-03 06:11:46 +0000
+++ po/uk.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/vi.po'
--- po/vi.po	2016-11-03 06:11:46 +0000
+++ po/vi.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/zh_CN.po'
--- po/zh_CN.po	2016-11-03 06:11:46 +0000
+++ po/zh_CN.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/zh_HK.po'
--- po/zh_HK.po	2016-11-03 06:11:46 +0000
+++ po/zh_HK.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'po/zh_TW.po'
--- po/zh_TW.po	2016-11-03 06:11:46 +0000
+++ po/zh_TW.po	2016-11-04 14:22:30 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-11-03 06:11+0000\n"
 "X-Generator: Launchpad (build 18246)\n"
+=======
+"X-Launchpad-Export-Date: 2016-09-22 08:54+0000\n"
+"X-Generator: Launchpad (build 18204)\n"
+>>>>>>> MERGE-SOURCE
 
 #: import/Ubuntu/Content/ContentPeerPicker10.qml:48
 #: import/Ubuntu/Content/ContentPeerPicker11.qml:49

=== modified file 'src/com/ubuntu/content/common.h'
--- src/com/ubuntu/content/common.h	2014-03-07 19:28:54 +0000
+++ src/com/ubuntu/content/common.h	2016-11-04 14:22:30 +0000
@@ -20,10 +20,12 @@
 #define COMMON_H
 
 #include <QLatin1String>
+#include <QString>
 
 const QLatin1String HUB_SERVICE_NAME = QLatin1String("com.ubuntu.content.dbus.Service");
 const QLatin1String HUB_SERVICE_PATH = QLatin1String("/");
 const QLatin1String HANDLER_NAME_TEMPLATE = QLatin1String("com.ubuntu.content.handler.%1");
 const QLatin1String HANDLER_BASE_PATH = QLatin1String("/com/ubuntu/content/handler");
+const QString PEER_PICKER_APP_ID = QLatin1String("content-hub-peer-picker");
 
 #endif // COMMON_H

=== modified file 'src/com/ubuntu/content/detail/com.ubuntu.content.Service.xml'
--- src/com/ubuntu/content/detail/com.ubuntu.content.Service.xml	2016-08-24 20:23:44 +0000
+++ src/com/ubuntu/content/detail/com.ubuntu.content.Service.xml	2016-11-04 14:22:30 +0000
@@ -75,5 +75,18 @@
     </signal>
     <signal name="PasteboardChanged">
     </signal>
+    <method name="RequestPeerForTypeByAppId">
+      <arg name="type_id" type="s" direction="in" />
+      <arg name="handler_id" type="s" direction="in" />
+      <arg name="app_id" type="s" direction="in" />
+    </method>
+    <method name="SelectPeerForAppId">
+      <arg name="app_id" type="s" direction="in" />
+      <arg name="peer_id" type="s" direction="in" />
+    </method>
+    <signal name="PeerSelected">
+      <arg name="app_id" type="s" />
+      <arg name="peer_id" type="s" />
+    </signal>
  </interface>
 </node>

=== modified file 'src/com/ubuntu/content/detail/service.cpp'
--- src/com/ubuntu/content/detail/service.cpp	2016-08-24 20:23:44 +0000
+++ src/com/ubuntu/content/detail/service.cpp	2016-11-04 14:22:30 +0000
@@ -185,6 +185,29 @@
     return QDBusVariant(QVariant::fromValue(peer));
 }
 
+void cucd::Service::RequestPeerForTypeByAppId(const QString& type_id, const QString& handler_id, const QString& app_id)
+{
+    TRACE() << Q_FUNC_INFO << app_id;
+    // FIXME: add logic to launch peer picker
+    if (d->app_manager->is_application_started(PEER_PICKER_APP_ID.toStdString()))
+        d->app_manager->stop_application(PEER_PICKER_APP_ID.toStdString());
+    gchar * uris[] = {
+        g_strdup(app_id.toStdString().c_str()),
+        g_strdup(type_id.toStdString().c_str()),
+        g_strdup(handler_id.toStdString().c_str()),
+        NULL
+    };
+
+    d->app_manager->invoke_application(PEER_PICKER_APP_ID.toStdString(), uris);
+}
+
+void cucd::Service::SelectPeerForAppId(const QString& app_id, const QString& peer_id)
+{
+    TRACE() << Q_FUNC_INFO << app_id << peer_id;
+    // FIXME: lock this down to only all the peer picker APP_ID to call this
+    Q_EMIT(PeerSelected(app_id, peer_id));
+}
+
 QDBusObjectPath cucd::Service::CreateImportFromPeer(const QString& peer_id, const QString& app_id, const QString& type_id)
 {
     TRACE() << Q_FUNC_INFO;

=== modified file 'src/com/ubuntu/content/detail/service.h'
--- src/com/ubuntu/content/detail/service.h	2016-08-24 20:23:44 +0000
+++ src/com/ubuntu/content/detail/service.h	2016-11-04 14:22:30 +0000
@@ -72,6 +72,8 @@
     void DownloadManagerError(QString);
     bool HasPending(const QString&);
     QDBusVariant PeerForId(const QString&);
+    void RequestPeerForTypeByAppId(const QString&, const QString&, const QString&);
+    void SelectPeerForAppId(const QString&, const QString&);
 
   private:
     QByteArray getPasteData(const QString &surfaceId, int pasteId);
@@ -85,6 +87,7 @@
   Q_SIGNALS:
     void PasteFormatsChanged(const QStringList &formats);
     void PasteboardChanged();
+    void PeerSelected(const QString &app_id, const QString &peer_id);
 
   private Q_SLOTS:
     void handle_imports(int);

=== modified file 'src/com/ubuntu/content/hub.cpp'
--- src/com/ubuntu/content/hub.cpp	2016-08-24 20:23:44 +0000
+++ src/com/ubuntu/content/hub.cpp	2016-11-04 14:22:30 +0000
@@ -89,6 +89,9 @@
     QObject::connect(d->service, SIGNAL(PasteboardChanged()),
             this,
             SIGNAL(pasteboardChanged()));
+    QObject::connect(d->service, SIGNAL(PeerSelected(const QString&, const QString&)),
+            this,
+            SLOT(onPeerSelected(const QString&, const QString&)));
 }
 
 cuc::Hub::~Hub()
@@ -101,6 +104,18 @@
     return hub;
 }
 
+void cuc::Hub::requestPeerForType(cuc::Type type, QString handler_id)
+{
+    TRACE() << Q_FUNC_INFO << type.id();
+    d->service->RequestPeerForTypeByAppId(type.id(), handler_id, app_id());
+}
+
+void cuc::Hub::selectPeerForAppId(QString app_id, QString peer_id)
+{
+    TRACE() << Q_FUNC_INFO << app_id << peer_id;
+    d->service->SelectPeerForAppId(app_id, peer_id);
+}
+
 void cuc::Hub::requestPasteFormats()
 {
     auto reply = d->service->PasteFormats();
@@ -126,6 +141,13 @@
     Q_EMIT(pasteFormatsChanged());
 }
 
+void cuc::Hub::onPeerSelected(const QString &id, const QString &peer_id)
+{
+    TRACE() << Q_FUNC_INFO << id << peer_id;
+    if (id == app_id())
+        Q_EMIT(peerSelected(peer_id));
+}
+
 bool cuc::Hub::eventFilter(QObject *obj, QEvent *event)
 {
    if (event->type() == QEvent::ApplicationActivate)

=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2015-05-27 20:58:31 +0000
+++ tools/CMakeLists.txt	2016-11-04 14:22:30 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2015 Canonical Ltd.
+# Copyright © 2015-2016 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
@@ -15,3 +15,4 @@
 # Authored by: Ken VanDine <[e-mail]>
 
 add_subdirectory(send)
+add_subdirectory(peer-picker)

=== added directory 'tools/peer-picker'
=== added file 'tools/peer-picker/CMakeLists.txt'
--- tools/peer-picker/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tools/peer-picker/CMakeLists.txt	2016-11-04 14:22:30 +0000
@@ -0,0 +1,45 @@
+# Copyright © 2015 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/>.
+#
+# Authored by: Ken VanDine <[e-mail]>
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+qt5_add_resources(RESOURCES qml.qrc)
+add_executable(
+  content-hub-peer-picker
+
+  main.cpp
+  ${RESOURCES}
+)
+
+qt5_use_modules(content-hub-peer-picker Core Gui Quick Qml)
+
+set_target_properties(
+  content-hub-peer-picker
+  PROPERTIES
+  AUTOMOC TRUE
+)
+
+install(
+  TARGETS content-hub-peer-picker
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+
+install(
+  FILES content-hub-peer-picker.desktop
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
+)

=== added file 'tools/peer-picker/ContentPageHeader.qml'
--- tools/peer-picker/ContentPageHeader.qml	1970-01-01 00:00:00 +0000
+++ tools/peer-picker/ContentPageHeader.qml	2016-11-04 14:22:30 +0000
@@ -0,0 +1,97 @@
+ /*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of content-hub.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+
+/*
+ * Component to use as page header in the ContentPeerPicker
+ *
+ * It has a cancel() signal fired when cancel button is pressed and a title
+ * property to set the page title
+ */
+
+Column {
+    id: root
+    signal cancel()
+    property string title
+
+    height: childrenRect.height
+
+    anchors {
+        left: parent.left
+        right: parent.right
+    }
+
+    Rectangle {
+        id: title
+
+        height: units.gu(7) - divider.height
+        anchors { left: parent.left; right: parent.right }
+
+        Rectangle {
+            anchors.fill: parent
+            color: Theme.palette.normal.background
+        }
+
+        AbstractButton {
+            id: cancelButton
+            objectName: "cancelButton"
+
+            width: height
+
+            onTriggered: root.cancel()
+            anchors {
+                top: parent.top
+                bottom: parent.bottom
+                left: parent.left
+            }
+
+            Rectangle {
+                anchors.fill: parent
+                anchors.leftMargin: units.gu(1)
+                anchors.rightMargin: units.gu(1)
+                color: "#E6E6E6"
+                visible: parent.pressed
+            }
+
+            Icon {
+                name: "close"
+                anchors {
+                    fill: parent
+                    topMargin: units.gu(2)
+                    bottomMargin: units.gu(2)
+                }
+            }
+        }
+
+        Label {
+            anchors {
+                left: cancelButton.right
+                verticalCenter: parent.verticalCenter
+            }
+            text: root.title
+            fontSize: 'x-large'
+        }
+    }
+
+    ListItem.Divider {
+        id: divider
+    }
+}

=== added file 'tools/peer-picker/PeerPicker.qml'
--- tools/peer-picker/PeerPicker.qml	1970-01-01 00:00:00 +0000
+++ tools/peer-picker/PeerPicker.qml	2016-11-04 14:22:30 +0000
@@ -0,0 +1,243 @@
+/*
+ * Copyright 2013-2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Content 1.3
+
+Page {
+    id: root
+    anchors.fill: parent
+
+    property var handler
+    property var contentType
+    property alias showTitle: pageHeader.visible
+    property var peer
+    property var customPeerModelLoader
+    property var completed: false
+    signal peerSelected
+    signal cancelPressed
+
+    Rectangle {
+        id: background
+        anchors.fill: parent
+        color: Theme.palette.normal.background
+    }
+
+    header: ContentPageHeader {
+        id: pageHeader
+        title: (handler === ContentHandler.Source) ? i18n.dtr("content-hub", "Choose from") : (handler === ContentHandler.Destination ? i18n.dtr("content-hub", "Open with") : i18n.dtr("content-hub", "Share to"))
+        onCancel: cancelPressed()
+    }
+
+    Loader {
+        id: peerModelLoader
+        active: false
+        asynchronous: true
+        sourceComponent: ContentPeerModel { }
+        onLoaded: {
+            item.handler = root.handler;
+            item.contentType = root.contentType;
+        }
+    }
+
+    Component.onCompleted: {
+        if (root.visible) {
+            if (customPeerModelLoader) {
+                customPeerModelLoader.active = true;
+            } else {
+                peerModelLoader.active = true;
+            }
+        }
+        completed = true;
+    }
+
+    onVisibleChanged: {
+        if (completed) {
+            if (customPeerModelLoader) {
+                customPeerModelLoader.active = true;
+            } else {
+                peerModelLoader.active = true;
+            }
+        }
+    }
+
+    onHandlerChanged: {
+        if (!customPeerModelLoader && peerModelLoader.item) {
+            appPeers.model = undefined; // Clear grid view
+            peerModelLoader.item.handler = root.handler;
+            appPeers.model = peerModelLoader.item.peers;
+        }
+    }
+
+    onContentTypeChanged: {
+        if (!customPeerModelLoader && peerModelLoader.item) {
+            appPeers.model = undefined; // Clear grid view
+            peerModelLoader.item.contentType = root.contentType;
+            appPeers.model = peerModelLoader.item.peers;
+        }
+    }
+
+    Component {
+        id: peerDelegate
+        Item {
+            width: units.gu(13.5)
+            height: units.gu(16)
+            AbstractButton {
+                width: parent.width
+                height: icon.height + label.height
+                UbuntuShape {
+                    id: icon
+                    anchors {
+                        top: parent.top
+                        horizontalCenter: parent.horizontalCenter
+                    }
+                    radius: "medium"
+                    width: units.gu(8)
+                    height: units.gu(7.5)
+                    sourceHorizontalAlignment: Image.AlignHCenter
+                    sourceVerticalAlignment: Image.AlignVCenter
+                    source: Image {
+                        id: image
+                        objectName: "image"
+                        sourceSize { width: icon.width; height: icon.height }
+                        asynchronous: true
+                        cache: false
+                        source: "image://content-hub/" + modelData.appId
+                    }
+               }
+
+                Label {
+                    id: label
+                    objectName: "label"
+                    anchors {
+                        baseline: icon.bottom
+                        baselineOffset: units.gu(2)
+                        left: parent.left
+                        right: parent.right
+                        leftMargin: units.gu(1)
+                        rightMargin: units.gu(1)
+                    }
+
+                    opacity: 0.9
+                    fontSize: "small"
+                    horizontalAlignment: Text.AlignHCenter
+                    text: modelData.name || modelData.appId
+                    wrapMode: Text.Wrap
+                    maximumLineCount: 2
+                }
+
+                onClicked: {
+                        peer = modelData
+                        peerSelected()
+                }
+            }
+
+        }
+    }
+
+    ListItem.Header {
+        id: appTitle
+        anchors.top: header.visible ? header.bottom : parent.top
+        text: i18n.dtr("content-hub", "Apps")
+    }
+
+    Rectangle {
+        id: apps
+        color: ColorUtils.luminance(background.color) >= 0.85 ? "#FFFFFF" : Qt.darker(background.color)
+        clip: true
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: appTitle.bottom
+            bottom: devTitle.visible ? devTitle.top : parent.bottom
+            bottomMargin: units.gu(1)
+        }
+
+        Flickable {
+            anchors.fill: parent
+
+            ResponsiveGridView {
+                id: appPeers
+                anchors.fill: parent
+                minimumHorizontalSpacing: units.gu(0.5)
+                maximumNumberOfColumns: 6
+                delegateWidth: units.gu(11)
+                delegateHeight: units.gu(11)
+                verticalSpacing: units.gu(2)
+                model: customPeerModelLoader ? customPeerModelLoader.item.peers : peerModelLoader.item.peers
+                delegate: peerDelegate
+
+                Label {
+                    anchors.top: parent.top
+                    anchors.topMargin: units.gu(2.5)
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    width: parent.width - units.gu(5)
+                    wrapMode: Text.WordWrap
+                    horizontalAlignment: Text.AlignHCenter
+                    text: root.handler === ContentHandler.Source ? i18n.dtr("content-hub", "Sorry, there aren't currently any apps installed that can provide this type of content.") : i18n.dtr("content-hub", "Sorry, there aren't currently any apps installed that can handle this type of content.")
+                    visible: appPeers.model ? appPeers.model.length == 0 : false
+                }
+            }
+        }
+    }
+
+    ListItem.Header {
+        id: devTitle
+        // TODO: make this visible when we have a way to populate devices
+        visible: false
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: apps.bottom
+        }
+        text: i18n.dtr("content-hub", "Devices")
+    }
+
+    Rectangle {
+        id: devices
+        // TODO: make this visible when we have a way to populate devices
+        visible: false
+        color: ColorUtils.luminance(background.color) >= 0.85 ? "#FFFFFF" : Qt.darker(background.color)
+        width: parent.width
+        radius: 0
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: devTitle.bottom
+            bottom: parent.bottom
+            bottomMargin: units.gu(1)
+        }
+
+        Flickable {
+            anchors.fill: parent
+
+            ResponsiveGridView {
+                id: devPeers
+                anchors.fill: parent
+                minimumHorizontalSpacing: units.gu(0.5)
+                maximumNumberOfColumns: 6
+                delegateWidth: units.gu(11)
+                delegateHeight: units.gu(9.5)
+                verticalSpacing: units.gu(2)
+                delegate: peerDelegate
+            }
+        }
+    }
+
+}

=== added file 'tools/peer-picker/ResponsiveGridView.qml'
--- tools/peer-picker/ResponsiveGridView.qml	1970-01-01 00:00:00 +0000
+++ tools/peer-picker/ResponsiveGridView.qml	2016-11-04 14:22:30 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+
+/*
+   Essentially a GridView where you can specify the maximum number of columns it can have.
+ */
+Item {
+    property int minimumHorizontalSpacing: units.gu(0.5)
+    // property int minimumNumberOfColumns: 2 // FIXME: not implemented
+    property int maximumNumberOfColumns: 6
+    readonly property int columns: gridView.columns
+    property alias verticalSpacing: gridView.verticalSpacing
+    readonly property alias margins: gridView.margin
+    property int delegateWidth
+    property int delegateHeight
+    property alias model: gridView.model
+    property alias delegate: gridView.delegate
+    readonly property int cellWidth: gridView.cellWidth
+    readonly property int cellHeight: gridView.cellHeight
+    property alias interactive: gridView.interactive
+    readonly property alias flicking: gridView.flicking
+    readonly property alias moving: gridView.moving
+    readonly property alias pressDelay: gridView.pressDelay
+    property alias highlightIndex: gridView.highlightIndex
+    readonly property alias currentItem: gridView.currentItem
+
+    function contentHeightForRows(rows) {
+        return rows * cellHeight + verticalSpacing
+    }
+
+    GridView {
+        id: gridView
+        objectName: "responsiveGridViewGrid"
+        anchors {
+            fill: parent
+            leftMargin: margin/2
+            rightMargin: margin/2
+            topMargin: verticalSpacing
+        }
+
+        onModelChanged: {
+            clip = parent.height != contentHeightForRows(Math.ceil(model.count / columns))
+        }
+
+        function pixelToGU(value) {
+            return Math.floor(value / units.gu(1));
+        }
+
+        function spacingForColumns(columns) {
+            // spacing between columns as an integer number of GU, the remainder goes in the margins
+            var spacingGU = pixelToGU(allocatableHorizontalSpace / columns);
+            return units.gu(spacingGU);
+        }
+
+        function columnsForSpacing(spacing) {
+            // minimum margin is half of the spacing
+            return Math.max(1, Math.floor(parent.width / (delegateWidth + spacing)));
+        }
+
+        property real allocatableHorizontalSpace: parent.width - columns * delegateWidth
+        property int columns: Math.min(columnsForSpacing(minimumHorizontalSpacing), maximumNumberOfColumns)
+        property real horizontalSpacing: spacingForColumns(columns)
+        property real verticalSpacing: horizontalSpacing
+        property int margin: allocatableHorizontalSpace - columns * horizontalSpacing
+        property int highlightIndex: -1
+
+        cellWidth: delegateWidth + horizontalSpacing
+        cellHeight: delegateHeight + verticalSpacing
+
+        onHighlightIndexChanged: {
+            if (highlightIndex != -1) {
+                currentIndex = highlightIndex
+            }
+        }
+    }
+}

=== added file 'tools/peer-picker/content-hub-peer-picker.desktop'
--- tools/peer-picker/content-hub-peer-picker.desktop	1970-01-01 00:00:00 +0000
+++ tools/peer-picker/content-hub-peer-picker.desktop	2016-11-04 14:22:30 +0000
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Content Hub Peer Picker
+Comment=Content Hub Peer Picker
+Exec=content-hub-peer-picker %U
+Icon=
+Terminal=false
+Type=Application
+OnlyShowIn=Old
+X-Ubuntu-Touch=true
+X-Ubuntu-Single-Instance=false
+X-Ubuntu-Splash-Show-Header=true
+X-Ubuntu-Splash-Title=Choose from

=== added file 'tools/peer-picker/main.cpp'
--- tools/peer-picker/main.cpp	1970-01-01 00:00:00 +0000
+++ tools/peer-picker/main.cpp	2016-11-04 14:22:30 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <iostream>
+#include <QGuiApplication>
+#include <QObject>
+#include <QQmlContext>
+#include <QQuickView>
+
+int main(int argc, char *argv[])
+{
+    QGuiApplication app(argc, argv);
+
+    bool fullScreen = false;
+    QQuickView *view = new QQuickView;
+    QString requesterId;
+    QString contentType;
+    QString handlerType;
+
+    QStringList args = app.arguments();
+
+    if (args.contains("--fullscreen")) {
+        args.removeAll("--fullscreen");
+        fullScreen = true;
+    }
+
+    if (args.count() < 4) {
+        std::cout << "Usage: content-hub-peer-picker app_id content_type handler_type\n";
+        return 1;
+    } else {
+        requesterId = args.at(1);
+        contentType = args.at(2);
+        handlerType = args.at(3);
+    }
+    // Set context properties needed by the picker
+    view->rootContext()->setContextProperty("requesterId", requesterId);
+    view->rootContext()->setContextProperty("wellKnownType", contentType);
+    view->rootContext()->setContextProperty("handlerType", handlerType);
+    // Hook up quit
+    QObject::connect((QObject*)view->engine(), SIGNAL(quit()), (QObject*)&app, SLOT(quit()));
+    view->setSource(QUrl(QStringLiteral("qrc:/main.qml")));
+    if (fullScreen) {
+        view->showFullScreen();
+    } else {
+        view->show();
+    }
+    return app.exec();
+}
+

=== added file 'tools/peer-picker/main.qml'
--- tools/peer-picker/main.qml	1970-01-01 00:00:00 +0000
+++ tools/peer-picker/main.qml	2016-11-04 14:22:30 +0000
@@ -0,0 +1,56 @@
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Content 1.3
+
+MainView {
+    id: mainView
+    width: units.gu(50)
+    height: units.gu(75)
+    applicationName: "content-hub-peer-picker"
+
+    PeerPicker {
+        showTitle: true
+        // Type of handler: Source, Destination, or Share
+        //handler: ContentHandler.Source
+        handler: {
+            if (handlerType === "source")
+                return ContentHandler.Source
+            if (handlerType === "share")
+                return ContentHandler.Share
+            else
+                return ContentHandler.Destination
+        }
+        // well know content type
+        contentType: {
+            if (wellKnownType === "documents")
+                return ContentType.Documents 
+            else if (wellKnownType === "pictures")
+                return ContentType.Pictures 
+            else if (wellKnownType === "music")
+                return ContentType.Music 
+            else if (wellKnownType === "contacts")
+                return ContentType.Contacts 
+            else if (wellKnownType === "videos")
+                return ContentType.Videos 
+            else if (wellKnownType === "links")
+                return ContentType.Links 
+            else if (wellKnownType === "ebooks")
+                return ContentType.EBooks 
+            else if (wellKnownType === "text")
+                return ContentType.Text 
+            else if (wellKnownType === "events")
+                return ContentType.Events 
+            else
+                return ContentType.All
+        }
+
+        onPeerSelected: {
+            ContentHub.selectPeerForAppId(requesterId, peer.appId)
+            Qt.quit()
+        }
+
+        onCancelPressed: {
+            Qt.quit()
+        }
+    }
+}

=== added file 'tools/peer-picker/qml.qrc'
--- tools/peer-picker/qml.qrc	1970-01-01 00:00:00 +0000
+++ tools/peer-picker/qml.qrc	2016-11-04 14:22:30 +0000
@@ -0,0 +1,9 @@
+<RCC>
+    <qresource prefix="/">
+        <file>main.qml</file>
+        <file>ContentPageHeader.qml</file>
+        <file>PeerPicker.qml</file>
+        <file>ResponsiveGridView.qml</file>
+    </qresource>
+</RCC>
+