Merge lp:~townsend/libertine/release-1.3 into lp:libertine/trunk

[Christopher Townsend]

* This creates a LibertineApplication which wraps up the starting of a container. This way we can mock creations of an Application.
* Rework the whole way we handle updating the necessary system files for unprivileged LXC's: (LP: #1598785)
  - Add new script that does the updates.
  - Add sudoers file for this script.
  - Remove the password dialog in the UI.
* Add functionality to "favorite" the Libertine scope upon first installation of the Puritine click package. (LP: #1602397)
* Bump version to 1.3.
* Allow adding all forms of additional archives to containers.
* Support adding private PPAs inside of a container. (LP: #1599882)

[Larry Price (larryprice)]

lgtm

review: Approve

[lp:~townsend/libertine/release-1.3]

142. By Christopher Townsend on 2016-07-21

Merge lp:libertine for replaces/breaks.

143. By Christopher Townsend on 2016-07-21

Merge lp:libertine for fix in using the wrong version number in previous merge.

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-05-19 14:29:57 +0000
+++ data/CMakeLists.txt	2016-07-21 17:26:05 +0000
@@ -1,3 +1,5 @@
+set(CMAKE_INSTALL_SYSCONFDIR "/etc")
+
 install(FILES libertine.desktop
         DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
 install(FILES libertine_64.png libertine-lxc.conf
@@ -6,6 +8,8 @@
         DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
 install(FILES puritine-15.04.1.framework
         DESTINATION ${CMAKE_INSTALL_DATADIR}/click/frameworks)
+install(FILES libertine-lxc-sudo
+        DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/sudoers.d)
 
 configure_file("libertine-tools.click-hook.in"
   "${CMAKE_SOURCE_DIR}/debian/libertine-tools.click-hook"
 
=== added file 'data/libertine-lxc-sudo'
--- data/libertine-lxc-sudo	1970-01-01 00:00:00 +0000
+++ data/libertine-lxc-sudo	2016-07-21 17:26:05 +0000
@@ -0,0 +1,1 @@
+ALL ALL=(ALL) NOPASSWD:/usr/bin/libertine-lxc-setup
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-07-07 20:17:22 +0000
+++ debian/changelog	2016-07-21 17:26:05 +0000
@@ -1,3 +1,25 @@
+libertine (1.3-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Brandon Schaefer ]
+  * This creates a LibertineApplication which wraps up the starting of a
+    container. This way we can mock creations of an Application.
+
+  [ Chris Townsend ]
+  * Rework the whole way we handle updating the necessary system files for
+    unprivileged LXC's: (LP: #1598785)
+    - Add new script that does the updates.
+    - Add sudoers file for this script.
+    - Remove the password dialog in the UI.
+  * Add functionality to "favorite" the Libertine scope upon first
+    installation of the Puritine click package. (LP: #1602397)
+  * Bump version to 1.3.
+
+  [ Larry Price ]
+  * Allow adding all forms of additional archives to containers.
+  * Support adding private PPAs inside of a container. (LP: #1599882)
+
+ -- Chris Townsend <[e-mail]>  Tue, 19 Jul 2016 11:28:00 -0400
+
 libertine (1.2.2+16.10.20160707-0ubuntu1) yakkety; urgency=medium
 
   [ Brandon Schaefer ]
 
=== modified file 'debian/control'
--- debian/control	2016-06-15 14:48:27 +0000
+++ debian/control	2016-07-21 17:26:05 +0000
@@ -116,6 +116,8 @@
          uidmap,
          ${misc:Depends},
          ${python3:Depends}
+Replaces: libertine-tools (<< 1.3)
+Breaks: libertine-tools (<< 1.3)
 Description: Python3 scripts for the Libertine application sandbox
  This package provides the LXC-based container back end module for the
  Libertine sandbox.  It requires support for unprivileged LXC containers in the
 
=== modified file 'debian/libertine-tools.install'
--- debian/libertine-tools.install	2016-06-07 19:49:27 +0000
+++ debian/libertine-tools.install	2016-07-21 17:26:05 +0000
@@ -1,12 +1,9 @@
 usr/bin/libertine-launch
 usr/bin/libertine-session-bridge
 usr/bin/libertine-container-manager
-usr/bin/libertine-lxc-manager
 usr/bin/libertine-xmir
 usr/share/bash-completion/completions/libertine-container-manager
 usr/lib/*/libertine/update-puritine-containers
 usr/share/man
-usr/share/libertine/libertine-lxc.conf
-usr/share/upstart/sessions/libertine-lxc-manager.conf
 usr/share/upstart/sessions/libertine-xmir.conf
 usr/share/click/frameworks/puritine-15.04.1.framework
 
=== modified file 'debian/python3-libertine-lxc.install'
--- debian/python3-libertine-lxc.install	2015-11-30 14:37:36 +0000
+++ debian/python3-libertine-lxc.install	2016-07-21 17:26:05 +0000
@@ -1,1 +1,6 @@
 usr/lib/python*/*/libertine/LxcContainer.py
+usr/bin/libertine-lxc-manager
+usr/share/libertine/libertine-lxc.conf
+usr/share/upstart/sessions/libertine-lxc-manager.conf
+etc/sudoers.d/libertine-lxc-sudo
+usr/bin/libertine-lxc-setup
 
=== modified file 'libertine/ContainerManager.cpp'
--- libertine/ContainerManager.cpp	2016-06-08 21:56:53 +0000
+++ libertine/ContainerManager.cpp	2016-07-21 17:26:05 +0000
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "libertine/ContainerManager.h"
+#include <QTemporaryFile>
 
 
 namespace
@@ -34,10 +35,12 @@
 constexpr auto libertine_container_manager_tool = "libertine-container-manager";
 
 
-static const QString readAllStdOutOrStdErr(QProcess& proc)
+static const QString readAllStdOutOrStdErr(QProcess& proc, const QString& default_output = "")
 {
-  auto out = proc.readAllStandardOutput();
-  return out.isEmpty() ? proc.readAllStandardError() : out;
+  QByteArray out = proc.readAllStandardOutput(),
+             err = proc.readAllStandardError();
+  return !out.isEmpty() ? out
+                        : !err.isEmpty() ? err : default_output;
 }
 
 
@@ -175,7 +178,7 @@
           [=](int exitCode, QProcess::ExitStatus){
     if (exitCode != 0)
     {
-      emit error(PACKAGE_INSTALLATION_FAILED.arg(package_name), process_output_.isEmpty() ? process_.readAllStandardError() : process_output_);
+      emit error(PACKAGE_INSTALLATION_FAILED.arg(package_name), readAllStdOutOrStdErr(process_, process_output_));
     }
     emit operationFinished(container_id, package_name);
   });
@@ -268,13 +271,14 @@
     if (!output.isEmpty())
     {
       emit updateOperationDetails(container_id, "", output);
+      process_output_ += output;
     }
   });
   connect(&process_, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
           [=](int exitCode, QProcess::ExitStatus){
     if (exitCode != 0)
     {
-      emit error(CONTAINER_CONFIGURE_FAILED.arg(container_name), readAllStdOutOrStdErr(process_));
+      emit error(CONTAINER_CONFIGURE_FAILED.arg(container_name), readAllStdOutOrStdErr(process_, process_output_));
     }
     else
     {
@@ -290,6 +294,29 @@
 
 
 void ContainerManagerWorker::
+addArchive(const QString& container_id, const QString& container_name, const QString& archive, const QByteArray& signing_key)
+{
+  QStringList command{"--archive", "add", "--archive-name", archive};
+  if (!signing_key.isEmpty())
+  {
+    QTemporaryFile keyfile;
+    if (!keyfile.open())
+    {
+      emit error(CONTAINER_CONFIGURE_FAILED.arg(container_name), keyfile.errorString());
+      return;
+    }
+
+    keyfile.setAutoRemove(false);
+    keyfile.write(signing_key);
+
+    command << "--public-key-file" << keyfile.fileName();
+  }
+
+  configureContainer(container_id, container_name, command);
+}
+
+
+void ContainerManagerWorker::
 fixIntegrity()
 {
   process_.start(libertine_container_manager_tool, QStringList{"fix-integrity"});
 
=== modified file 'libertine/ContainerManager.h'
--- libertine/ContainerManager.h	2016-06-08 21:12:57 +0000
+++ libertine/ContainerManager.h	2016-07-21 17:26:05 +0000
@@ -42,6 +42,7 @@
   Q_INVOKABLE void updateContainer(const QString& container_id, const QString& container_name);
   Q_INVOKABLE void runCommand(const QString& container_id, const QString& container_name, const QString& command_line);
   Q_INVOKABLE void configureContainer(const QString& container_id, const QString& container_name, const QStringList& configure_command);
+  Q_INVOKABLE void addArchive(const QString& container_id, const QString& container_name, const QString& archive, const QByteArray& signing_key);
   Q_INVOKABLE void fixIntegrity();
   Q_INVOKABLE void setDefaultContainer(const QString& container_id, bool should_clear);
 
 
=== removed file 'libertine/PasswordHelper.cpp'
--- libertine/PasswordHelper.cpp	2016-04-21 13:43:38 +0000
+++ libertine/PasswordHelper.cpp	1970-01-01 00:00:00 +0000
@@ -1,123 +0,0 @@
-/**
- * @file PasswordHelper.cpp
- * @brief Helper class for managing password entry
- */
-/*
- * Copyright 2015 Canonical Ltd
- *
- * Libertine 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.
- *
- * Libertine 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 "libertine/PasswordHelper.h"
-
-#include <iostream>
-#include <termios.h>
-#include <unistd.h>
-
-using namespace std;
-
-namespace
-{
-
-struct pam_response *reply;
-
-int function_conversation(int, const struct pam_message**, struct pam_response **resp, void*)
-{
-  *resp = reply;
-  return PAM_SUCCESS;
-}
-
-void set_stdin_echo(bool enable = true)
-{
-  struct termios tty;
-
-  tcgetattr(STDIN_FILENO, &tty);
-  if (!enable)
-      tty.c_lflag &= ~ECHO;
-  else
-      tty.c_lflag |= ECHO;
-
-  (void) tcsetattr(STDIN_FILENO, TCSANOW, &tty);
-}
-
-}  // anonymous namespace
-
-
-PasswordHelper::
-PasswordHelper()
-{
-}
-
-
-PasswordHelper::
-~PasswordHelper()
-{
-}
-
-
-QString PasswordHelper::
-GetPassword()
-{
-  string password;
-
-  cout << "Please enter your password:" << endl;
-
-  set_stdin_echo(false);
-  getline(cin, password);
-  set_stdin_echo(true);
-
-  if (cin.fail() || cin.eof())
-  {
-    return nullptr;
-  }
-  else
-  {
-    return QString::fromStdString(password);
-  }
-}
-
-
-bool PasswordHelper::
-VerifyUserPassword(QString const& password)
-{
-  char *username = getenv("USER");
-  int retval;
-
-  const struct pam_conv local_conversation = { function_conversation, NULL };
-  pam_handle_t *local_auth_handle = NULL;
-
-  retval = pam_start("common_auth", username, &local_conversation, &local_auth_handle);
-
-  if (retval != PAM_SUCCESS)
-  {
-    return false;
-  }
-
-  reply = (struct pam_response *)malloc(sizeof(struct pam_response));
-
-  reply[0].resp = strdup(password.toStdString().c_str());
-  reply[0].resp_retcode = 0;
-
-  retval = pam_authenticate(local_auth_handle, 0);
-
-  if (retval != PAM_SUCCESS)
-  {
-    return false;
-  }
-
-  retval = pam_end(local_auth_handle, retval);
-
-  if (retval != PAM_SUCCESS)
-  {
-    return false;
-  }
-  return true;
-}
 
=== removed file 'libertine/PasswordHelper.h'
--- libertine/PasswordHelper.h	2015-09-02 18:58:33 +0000
+++ libertine/PasswordHelper.h	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-/**
- * @file PasswordHelper.h
- * @brief Helper class for managing password entry
- */
-/*
- * Copyright 2015 Canonical Ltd
- *
- * Libertine 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.
- *
- * Libertine 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/>.
- */
-#ifndef LIBERTINE_PASSWORD_HELPER_H_
-#define LIBERTINE_PASSWORD_HELPER_H_
-
-#include <iostream>
-#include <security/pam_appl.h>
-#include <QtCore/QObject>
-#include <QtCore/QString>
-
-class PasswordHelper
-: public QObject
-{
-  Q_OBJECT
-
-public:
-  PasswordHelper();
-  ~PasswordHelper();
-
-  QString
-  GetPassword();
-
-  Q_INVOKABLE bool
-  VerifyUserPassword(QString const& password);
-};
-
-#endif /* LIBERTINE_PASSWORD_HELPER_H_ */
 
=== modified file 'libertine/libertine.cpp'
--- libertine/libertine.cpp	2016-03-09 15:09:05 +0000
+++ libertine/libertine.cpp	2016-07-21 17:26:05 +0000
@@ -26,7 +26,6 @@
 #include "libertine/ContainerConfigList.h"
 #include "libertine/libertine.h"
 #include "libertine/LibertineConfig.h"
-#include "libertine/PasswordHelper.h"
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
@@ -94,7 +93,6 @@
   config_.reset(new LibertineConfig(*this));
   qmlRegisterType<ContainerConfig>("Libertine", 1, 0, "ContainerConfig");
   qmlRegisterType<ContainerManagerWorker>("Libertine", 1, 0, "ContainerManagerWorker");
-  qmlRegisterType<PasswordHelper>("Libertine", 1, 0, "PasswordHelper");
 
   watcher_.addPath(config_.data()->containers_config_file_name());
   connect(&watcher_, SIGNAL(fileChanged(QString)), SLOT(reload_config(QString)));
@@ -107,7 +105,6 @@
   containers_ = new ContainerConfigList(config_.data(), this);
   container_apps_ = new ContainerAppsList(containers_, this);
   container_archives_ = new ContainerArchivesList(containers_, this);
-  password_helper_ = new PasswordHelper();
 
   initialize_view();
   view_.show();
@@ -134,7 +131,6 @@
   ctxt->setContextProperty("containerConfigList", containers_);
   ctxt->setContextProperty("containerAppsList", container_apps_);
   ctxt->setContextProperty("containerArchivesList", container_archives_);
-  ctxt->setContextProperty("passwordHelper", password_helper_);
 
   view_.setSource(QUrl::fromLocalFile(main_qml_source_file_));
   connect(view_.engine(), SIGNAL(quit()), SLOT(quit()));
 
=== modified file 'libertine/libertine.h'
--- libertine/libertine.h	2016-03-09 15:09:05 +0000
+++ libertine/libertine.h	2016-07-21 17:26:05 +0000
@@ -28,7 +28,6 @@
 
 class ContainerConfigList;
 class LibertineConfig;
-class PasswordHelper;
 class ContainerAppsList;
 class ContainerArchivesList;
 
@@ -57,7 +56,6 @@
     ContainerConfigList*            containers_;
     ContainerAppsList*              container_apps_;
     ContainerArchivesList*          container_archives_;
-    PasswordHelper*                 password_helper_;
     QQuickView                      view_;
 };
 
 
=== added file 'libertine/qml/AddExtraArchiveView.qml'
--- libertine/qml/AddExtraArchiveView.qml	1970-01-01 00:00:00 +0000
+++ libertine/qml/AddExtraArchiveView.qml	2016-07-21 17:26:05 +0000
@@ -0,0 +1,117 @@
+/**
+ * @file AddExtraArchiveView.qml
+ * @brief Libertine container add archive view
+ */
+/*
+ * Copyright 2016 Canonical Ltd
+ *
+ * Libertine 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.
+ *
+ * Libertine 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 Libertine 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Page {
+    id: addExtraArchiveView
+    header: PageHeader {
+        id: pageHeader
+        title: i18n.tr("Add Archive")
+    }
+    property string currentContainer: ""
+
+    Column {
+        spacing: units.gu(2)
+
+        anchors {
+            topMargin: pageHeader.height + units.gu(2)
+            leftMargin: units.gu(2)
+            rightMargin: units.gu(2)
+            fill: parent
+        }
+
+        Label {
+            text: i18n.tr("New archive identifier, e.g.")
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+        }
+
+        TextEdit {
+            text: i18n.tr("multiverse\nppa:user/repository\ndeb http://myserver/repo stable repo")
+            anchors {
+                left: parent.left
+                right: parent.right
+                leftMargin: units.gu(4)
+            }
+
+            readOnly: true
+            color: UbuntuColors.darkGrey
+        }
+
+        TextField {
+            id: extraArchiveString
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            onAccepted: {
+                addArchive()
+            }
+        }
+
+        Label {
+            text: i18n.tr("(Optional) Public signing key for archive")
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+        }
+
+        TextArea {
+            id: publicSigningKey
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            height: Math.max(addExtraArchiveView.height/3, units.gu(6))
+        }
+
+        Button {
+            text: i18n.tr("Add")
+            color: UbuntuColors.green
+            onClicked: {
+                addArchive()
+            }
+        }
+    }
+
+    function addArchive() {
+        var worker = Qt.createComponent("ContainerManager.qml").createObject(mainView)
+        worker.finishedConfigure.connect(finishedConfigure)
+        worker.error.connect(mainView.error)
+        worker.addArchive(currentContainer, containerConfigList.getContainerName(currentContainer),
+                          extraArchiveString.text, publicSigningKey.text.trim())
+
+        pageStack.pop()
+    }
+
+    Component.onCompleted: {
+        extraArchiveString.forceActiveFocus()
+    }
+
+    function finishedConfigure() {
+        if (addExtraArchiveView) {
+            containerArchivesList.setContainerArchives(currentContainer)
+        }
+    }
+}
 
=== modified file 'libertine/qml/ContainerOptionsDialog.qml'
--- libertine/qml/ContainerOptionsDialog.qml	2016-05-06 21:13:01 +0000
+++ libertine/qml/ContainerOptionsDialog.qml	2016-07-21 17:26:05 +0000
@@ -26,10 +26,9 @@
     id: containerOptionsDialog
     title: i18n.tr("Container Options")
     text: i18n.tr("Configure options for container creation.")
-    property var showPasswordDialog: false
-    signal passwordDialogSignal(var enableMultiarch, var containerName)
 
     Row {
+        visible: containerConfigList.getHostArchitecture() == 'x86_64' ? true : false
         spacing: units.gu(1)
         CheckBox {
             id: enableMultiarchCheckbox
@@ -47,7 +46,7 @@
 
     Label {
         id: containerNameText
-        text: i18n.tr("Enter or name for the container or leave blank for default name")
+        text: i18n.tr("Enter a name for the container or leave blank for default name:")
         wrapMode: Text.Wrap
     }
 
@@ -57,6 +56,20 @@
         onAccepted: okButton.clicked()
     }
 
+    Label {
+        id: containerPasswordText
+        visible: true
+        text: i18n.tr("Enter password for your user in the Libertine container or leave blank for no password:")
+        wrapMode: Text.Wrap
+    }
+
+    TextField {
+        id: containerPasswordInput
+        visible: containerPasswordText.visible
+        placeholderText: i18n.tr("password")
+        echoMode: TextInput.Password
+    }
+
     Row {
         spacing: units.gu(1)
         Button {
@@ -65,7 +78,7 @@
             color: UbuntuColors.green
             width: (parent.width - parent.spacing) / 2
             onClicked: {
-                showPasswordDialog = true
+                createContainer()
                 PopupUtils.close(containerOptionsDialog)
             }
         }
@@ -79,9 +92,18 @@
         }
     }
 
-    Component.onDestruction: {
-        if (showPasswordDialog) {
-            passwordDialogSignal(enableMultiarchCheckbox.checked, containerNameInput.text)
-        }
+    function createContainer() {
+        var container_id = containerConfigList.addNewContainer("lxc", containerNameInput.text)
+        var worker = Qt.createComponent("ContainerManager.qml").createObject(mainView)
+
+        worker.updateOperationDetails.connect(mainView.updateOperationDetails)
+        worker.operationFinished.connect(mainView.resetOperationDetails)
+        worker.error.connect(mainView.error)
+
+        worker.createContainer(container_id,
+                               containerConfigList.getContainerName(container_id),
+                               containerConfigList.getContainerDistro(container_id),
+                               enableMultiarchCheckbox.checked,
+                               containerPasswordInput.text)
     }
 }
 
=== removed file 'libertine/qml/ContainerPasswordDialog.qml'
--- libertine/qml/ContainerPasswordDialog.qml	2016-06-10 13:22:16 +0000
+++ libertine/qml/ContainerPasswordDialog.qml	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-/**
- * @file ContainerPasswordDialog.qml
- * @brief Libertine container password dialog
- */
-/*
- * Copyright 2016 Canonical Ltd
- *
- * Libertine 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.
- *
- * Libertine 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 Libertine 1.0
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.3
-
-
-Dialog {
-    id: passwordDialog
-    title: i18n.tr("Authentication required")
-    text: i18n.tr("Password is required to create a Libertine container")
-    property var enableMultiarch: false
-    property var containerName: null
-    property var switchPage: false
-
-    Label {
-        id: invalidPasswordText
-        visible: false
-        text: i18n.tr("Invalid password entered")
-    }
-
-    TextField {
-        id: passwordInput
-        placeholderText: i18n.tr("password")
-        echoMode: TextInput.Password
-
-        onAccepted: okButton.clicked()
-    }
-
-    Row {
-        spacing: units.gu(1)
-
-        Button {
-            id: okButton
-            text: i18n.tr("OK")
-            color: UbuntuColors.green
-            width: (parent.width - parent.spacing) / 2
-            onClicked: {
-                if (passwordHelper.VerifyUserPassword(passwordInput.text)) {
-                    passwordAccepted(text)
-                    switchPage = true
-                    PopupUtils.close(passwordDialog)
-                }
-                else {
-                    invalidPasswordText.visible = true
-                }
-                passwordInput.text = ""
-            }
-        }
-
-        Button {
-            id: cancelButton
-            text: i18n.tr("Cancel")
-            color: UbuntuColors.red
-            width: (parent.width - parent.spacing) / 2
-            onClicked: PopupUtils.close(passwordDialog)
-        }
-    }
-
-    Component.onCompleted: passwordInput.forceActiveFocus()
-
-    Component.onDestruction: {
-        if (switchPage) {
-            pageStack.clear()
-            pageStack.push(Qt.resolvedUrl("ContainersView.qml"))
-        }
-    }
-
-    function passwordAccepted(password) {
-        var container_id = containerConfigList.addNewContainer("lxc", containerName)
-        var comp = Qt.createComponent("ContainerManager.qml")
-        var worker = comp.createObject(mainView)
-
-        worker.updateOperationDetails.connect(mainView.updateOperationDetails)
-        worker.operationFinished.connect(mainView.resetOperationDetails)
-        worker.error.connect(mainView.error)
-
-        worker.createContainer(container_id, containerConfigList.getContainerName(container_id),
-                               containerConfigList.getContainerDistro(container_id), enableMultiarch, password)
-    }
-}
 
=== modified file 'libertine/qml/ContainersView.qml'
--- libertine/qml/ContainersView.qml	2016-06-08 21:36:14 +0000
+++ libertine/qml/ContainersView.qml	2016-07-21 17:26:05 +0000
@@ -35,8 +35,7 @@
             Action {
                 iconName: "add"
                 onTriggered: {
-                    var popup = PopupUtils.open(Qt.resolvedUrl("ContainerOptionsDialog.qml"))
-                    popup.passwordDialogSignal.connect(showPasswordDialog)
+                    PopupUtils.open(Qt.resolvedUrl("ContainerOptionsDialog.qml"))
                 }
             }
         ]
 
=== modified file 'libertine/qml/ExtraArchivesView.qml'
--- libertine/qml/ExtraArchivesView.qml	2016-06-27 14:43:49 +0000
+++ libertine/qml/ExtraArchivesView.qml	2016-07-21 17:26:05 +0000
@@ -1,6 +1,6 @@
 /**
  * @file ExtraArchiveView.qml
- * @brief Libertine container add archive view
+ * @brief Libertine container extra archive view
  */
 /*
  * Copyright 2016 Canonical Ltd
@@ -19,59 +19,25 @@
 import Libertine 1.0
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.3
 
 Page {
     id: extraArchiveView
     header: PageHeader {
         id: pageHeader
-        title: i18n.tr("Additional Archives and PPAs")
+        title: i18n.tr("Additional Archives")
         trailingActionBar.actions: [
             Action {
                 iconName: "add"
                 text: i18n.tr("add")
-                description: i18n.tr("Add a new PPA")
-                onTriggered: PopupUtils.open(addArchivePopup)
+                description: i18n.tr("Add a new archive")
+                onTriggered: pageStack.push(Qt.resolvedUrl("AddExtraArchiveView.qml"), {currentContainer: currentContainer})
             }
         ]
     }
-    property var archive_name: null
-    property var worker: null
+    property string currentContainer: ""
+
     signal error(string description, string details)
 
-    Component {
-        id: addArchivePopup
-        Dialog {
-            id: addArchiveDialog
-            title: i18n.tr("Add additional PPA")
-            text: i18n.tr("Enter name of PPA in the form ppa:user/ppa-name:")
-
-            TextField {
-                id: extraArchiveString
-                onAccepted: {
-                    PopupUtils.close(addArchiveDialog)
-                    addArchive(text)
-                }
-            }
-            Button {
-                text: i18n.tr("OK")
-                color: UbuntuColors.green
-                onClicked: {
-                    PopupUtils.close(addArchiveDialog)
-                    addArchive(extraArchiveString.text)
-                }
-            }
-            Button {
-                text: i18n.tr("Cancel")
-                color: UbuntuColors.red
-                onClicked: PopupUtils.close(addArchiveDialog)
-            }
-            Component.onCompleted: {
-                extraArchiveString.forceActiveFocus()
-            }
-        }
-    }
-
     UbuntuListView {
         id: extraArchiveList
         anchors {
@@ -88,6 +54,8 @@
                     leftMargin: units.gu(2)
                 }
                 text: archiveName
+                width: parent.width - units.gu(8)
+                elide: Text.ElideMiddle
             }
             ActivityIndicator {
                 id: extraArchiveActivity
@@ -125,18 +93,11 @@
         text: i18n.tr("No additional archives and PPA's have been added")
     }
 
-    function addArchive(archive) {
-        var worker = Qt.createComponent("ContainerManager.qml").createObject(mainView)
-        worker.finishedConfigure.connect(finishedConfigure)
-        worker.error.connect(sendAddError)
-        worker.configureContainer(mainView.currentContainer, containerConfigList.getContainerName(mainView.currentContainer), ["--add-archive", archive])
-    }
-
     function deleteArchive(archive) {
         var worker = Qt.createComponent("ContainerManager.qml").createObject(mainView)
         worker.finishedConfigure.connect(finishedConfigure)
         worker.error.connect(sendDeleteError)
-        worker.configureContainer(mainView.currentContainer, containerConfigList.getContainerName(mainView.currentContainer), ["--delete-archive", archive])
+        worker.configureContainer(currentContainer, containerConfigList.getContainerName(currentContainer), ["--archive", "remove", "--archive-name", "\"" + archive + "\""])
     }
 
     Component.onCompleted: {
@@ -146,28 +107,19 @@
 
     Component.onDestruction: {
         containerConfigList.configChanged.disconnect(reloadArchives)
-
         error.disconnect(mainView.error)
-
-        if (worker) {
-            worker.finishedConfigure.disconnect(finishedConfigure)
-            worker.error.disconnect(sendAddError)
-            worker.error.disconnect(sendDeleteError)
-        }
     }
 
     function reloadArchives() {
-        containerArchivesList.setContainerArchives(mainView.currentContainer)
+        containerArchivesList.setContainerArchives(currentContainer)
 
         extraArchiveList.visible = !containerArchivesList.empty() ? true : false
     }
 
     function finishedConfigure() {
-        containerArchivesList.setContainerArchives(mainView.currentContainer)
-    }
-
-    function sendAddError(desc, details) {
-        error(i18n.tr("Adding archive failed"), details)
+        if (extraArchiveView) {
+            containerArchivesList.setContainerArchives(currentContainer)
+        }
     }
 
     function sendDeleteError(desc, details) {
 
=== modified file 'libertine/qml/ManageContainer.qml'
--- libertine/qml/ManageContainer.qml	2016-06-08 21:56:53 +0000
+++ libertine/qml/ManageContainer.qml	2016-07-21 17:26:05 +0000
@@ -74,7 +74,7 @@
                 progression: true
                 onClicked: {
                     containerArchivesList.setContainerArchives(currentContainer)
-                    pageStack.push(Qt.resolvedUrl("ExtraArchivesView.qml"))
+                    pageStack.push(Qt.resolvedUrl("ExtraArchivesView.qml"), {currentContainer: currentContainer})
                 }
             }
 
 
=== modified file 'libertine/qml/WelcomeView.qml'
--- libertine/qml/WelcomeView.qml	2016-05-09 13:24:23 +0000
+++ libertine/qml/WelcomeView.qml	2016-07-21 17:26:05 +0000
@@ -67,8 +67,7 @@
             color: UbuntuColors.green
 
             onClicked: {
-                var popup = PopupUtils.open(Qt.resolvedUrl("ContainerOptionsDialog.qml"))
-                popup.passwordDialogSignal.connect(showPasswordDialog)
+                PopupUtils.open(Qt.resolvedUrl("ContainerOptionsDialog.qml"))
             }
         }
     }
 
=== modified file 'liblibertine/CMakeLists.txt'
--- liblibertine/CMakeLists.txt	2016-03-09 15:09:05 +0000
+++ liblibertine/CMakeLists.txt	2016-07-21 17:26:05 +0000
@@ -12,7 +12,6 @@
   ${libertine_src}/ContainerManager.cpp
   ${libertine_src}/ContainerAppsList.cpp
   ${libertine_src}/ContainerArchivesList.cpp
-  ${libertine_src}/PasswordHelper.cpp
 )
 set_target_properties(libertine-common PROPERTIES
   VERSION ${ABI_VERSION}.0.0
 
=== modified file 'po/en_GB.po'
--- po/en_GB.po	2016-07-15 05:42:05 +0000
+++ po/en_GB.po	2016-07-21 17:26:05 +0000
@@ -6,15 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libertine\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-06-07 07:58-0400\n"
 "PO-Revision-Date: 2016-05-20 16:53+0000\n"
 "Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-15 05:42+0000\n"
+"X-Launchpad-Export-Date: 2016-07-01 06:06+0000\n"
 "X-Generator: Launchpad (build 18115)\n"
 
 #: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:184
@@ -22,32 +23,32 @@
 msgstr "new"
 
 #: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:185
-#: ../libertine/qml/ContainersView.qml:81
-#: ../libertine/qml/ExtraArchivesView.qml:106 ../libertine/qml/HomeView.qml:205
+#: ../libertine/qml/ContainersView.qml:81 ../libertine/qml/HomeView.qml:197
+#: ../libertine/qml/ExtraArchivesView.qml:99
 msgid "installing"
 msgstr "installing"
 
-#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:118
-#: ../libertine/qml/ManageContainer.qml:85
-#: ../libertine/qml/ManageContainer.qml:152
+#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:119
+#: ../libertine/qml/ManageContainer.qml:79
+#: ../libertine/qml/ManageContainer.qml:119
 msgid "ready"
 msgstr "ready"
 
-#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:119
-#: ../libertine/qml/ManageContainer.qml:97
-#: ../libertine/qml/ManageContainer.qml:148
+#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:120
+#: ../libertine/qml/ManageContainer.qml:91
+#: ../libertine/qml/ManageContainer.qml:115
 msgid "updating"
 msgstr "updating"
 
 #: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
-#: ../libertine/qml/ContainersView.qml:82
-#: ../libertine/qml/ExtraArchivesView.qml:107 ../libertine/qml/HomeView.qml:206
+#: ../libertine/qml/ContainersView.qml:82 ../libertine/qml/HomeView.qml:198
+#: ../libertine/qml/ExtraArchivesView.qml:100
 msgid "removing"
 msgstr "removing"
 
 #: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:189
-#: ../libertine/qml/ContainerInfoView.qml:143
-#: ../libertine/qml/PackageInfoView.qml:148
+#: ../libertine/qml/PackageInfoView.qml:131
+#: ../libertine/qml/ContainerInfoView.qml:93
 msgid "removed"
 msgstr "removed"
 
@@ -115,7 +116,7 @@
 msgid "My Containers"
 msgstr "My Containers"
 
-#: ../libertine/qml/ContainersView.qml:92 ../libertine/qml/HomeView.qml:218
+#: ../libertine/qml/ContainersView.qml:92 ../libertine/qml/HomeView.qml:210
 msgid "delete"
 msgstr "delete"
 
@@ -123,19 +124,19 @@
 msgid "Delete Container"
 msgstr "Delete Container"
 
-#: ../libertine/qml/ContainersView.qml:107 ../libertine/qml/HomeView.qml:230
+#: ../libertine/qml/ContainersView.qml:108 ../libertine/qml/HomeView.qml:222
 msgid "info"
 msgstr "info"
 
-#: ../libertine/qml/ContainersView.qml:108
+#: ../libertine/qml/ContainersView.qml:109
 msgid "Container Info"
 msgstr "Container Info"
 
-#: ../libertine/qml/ContainersView.qml:116
+#: ../libertine/qml/ContainersView.qml:117
 msgid "edit"
 msgstr "edit"
 
-#: ../libertine/qml/ContainersView.qml:117
+#: ../libertine/qml/ContainersView.qml:118
 msgid "Container Apps"
 msgstr "Container Apps"
 
@@ -152,17 +153,17 @@
 msgid "search"
 msgstr "search"
 
+#: ../libertine/qml/SearchPackagesDialog.qml:39
+#: ../libertine/qml/ContainerPasswordDialog.qml:52
+#: ../libertine/qml/HomeView.qml:68 ../libertine/qml/ExtraArchivesView.qml:57
 #: ../libertine/qml/ContainerOptionsDialog.qml:64
-#: ../libertine/qml/ContainerPasswordDialog.qml:52
-#: ../libertine/qml/ExtraArchivesView.qml:64 ../libertine/qml/HomeView.qml:68
-#: ../libertine/qml/SearchPackagesDialog.qml:39
 msgid "OK"
 msgstr "OK"
 
+#: ../libertine/qml/SearchPackagesDialog.qml:57
+#: ../libertine/qml/ContainerPasswordDialog.qml:70
+#: ../libertine/qml/HomeView.qml:88 ../libertine/qml/ExtraArchivesView.qml:65
 #: ../libertine/qml/ContainerOptionsDialog.qml:75
-#: ../libertine/qml/ContainerPasswordDialog.qml:70
-#: ../libertine/qml/ExtraArchivesView.qml:72 ../libertine/qml/HomeView.qml:88
-#: ../libertine/qml/SearchPackagesDialog.qml:57
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -174,15 +175,15 @@
 msgid "Obtaining package version…"
 msgstr "Obtaining package version…"
 
-#: ../libertine/qml/PackageInfoView.qml:60
+#: ../libertine/qml/PackageInfoView.qml:59
 msgid "Package version"
 msgstr "Package version"
 
-#: ../libertine/qml/PackageInfoView.qml:68
+#: ../libertine/qml/PackageInfoView.qml:67
 msgid "Install status"
 msgstr "Install status"
 
-#: ../libertine/qml/PackageInfoView.qml:159
+#: ../libertine/qml/PackageInfoView.qml:140
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -210,8 +211,8 @@
 msgid "Searching for packages…"
 msgstr "Searching for packages…"
 
+#: ../libertine/qml/SearchResults.qml:60
 #: ../libertine/qml/DebianPackagePicker.qml:70
-#: ../libertine/qml/SearchResults.qml:60
 msgid "Install Package"
 msgstr "Install Package"
 
@@ -219,20 +220,20 @@
 msgid "Manage %1"
 msgstr "Manage %1"
 
+#: ../libertine/qml/ManageContainer.qml:63
 #: ../libertine/qml/ContainerOptionsDialog.qml:40
-#: ../libertine/qml/ManageContainer.qml:69
 msgid "i386 multiarch support"
 msgstr "i386 multiarch support"
 
-#: ../libertine/qml/ManageContainer.qml:73
+#: ../libertine/qml/ManageContainer.qml:67
 msgid "Additional archives and PPAs"
 msgstr "Additional archives and PPAs"
 
-#: ../libertine/qml/ManageContainer.qml:84
+#: ../libertine/qml/ManageContainer.qml:78
 msgid "Update…"
 msgstr "Update…"
 
-#: ../libertine/qml/ManageContainer.qml:100
+#: ../libertine/qml/ManageContainer.qml:94
 msgid "Update container"
 msgstr "Update container"
 
@@ -282,39 +283,39 @@
 msgstr ""
 "The %1 package is already installed. Please try a different package name."
 
-#: ../libertine/qml/HomeView.qml:105
+#: ../libertine/qml/HomeView.qml:104
 msgid "Manage Container"
 msgstr "Manage Container"
 
-#: ../libertine/qml/HomeView.qml:112
+#: ../libertine/qml/HomeView.qml:110
 msgid "Container Information"
 msgstr "Container Information"
 
-#: ../libertine/qml/HomeView.qml:119
+#: ../libertine/qml/HomeView.qml:116
 msgid "Switch Container"
 msgstr "Switch Container"
 
-#: ../libertine/qml/HomeView.qml:135
+#: ../libertine/qml/HomeView.qml:132
 msgid "Enter package name or Debian file"
 msgstr "Enter package name or Debian file"
 
-#: ../libertine/qml/HomeView.qml:143
+#: ../libertine/qml/HomeView.qml:138
 msgid "Choose Debian package to install"
 msgstr "Choose Debian package to install"
 
-#: ../libertine/qml/HomeView.qml:152
+#: ../libertine/qml/HomeView.qml:145
 msgid "Search archives for a package"
 msgstr "Search archives for a package"
 
-#: ../libertine/qml/HomeView.qml:219
+#: ../libertine/qml/HomeView.qml:211
 msgid "Remove Package"
 msgstr "Remove Package"
 
-#: ../libertine/qml/HomeView.qml:231
+#: ../libertine/qml/HomeView.qml:223
 msgid "Package Info"
 msgstr "Package Info"
 
-#: ../libertine/qml/HomeView.qml:248
+#: ../libertine/qml/HomeView.qml:240
 msgid "No packages are installed"
 msgstr "No packages are installed"
 
@@ -338,27 +339,27 @@
 msgid "Enter name of PPA in the form ppa:user/ppa-name:"
 msgstr "Enter name of PPA in the form ppa:user/ppa-name:"
 
-#: ../libertine/qml/ExtraArchivesView.qml:114
+#: ../libertine/qml/ExtraArchivesView.qml:107
 msgid "remove"
 msgstr "remove"
 
-#: ../libertine/qml/ExtraArchivesView.qml:115
+#: ../libertine/qml/ExtraArchivesView.qml:108
 msgid "Remove extra archive"
 msgstr "Remove extra archive"
 
-#: ../libertine/qml/ExtraArchivesView.qml:132
+#: ../libertine/qml/ExtraArchivesView.qml:125
 msgid "No additional archives and PPA's have been added"
 msgstr "No additional archives and PPAs have been added"
 
-#: ../libertine/qml/ExtraArchivesView.qml:177
+#: ../libertine/qml/ExtraArchivesView.qml:173
 msgid "Adding archive failed"
 msgstr "Adding archive failed"
 
-#: ../libertine/qml/ExtraArchivesView.qml:181
+#: ../libertine/qml/ExtraArchivesView.qml:177
 msgid "Deleting archive failed"
 msgstr "Deleting archive failed"
 
-#: ../libertine/qml/GenericErrorDialog.qml:46
+#: ../libertine/qml/GenericErrorDialog.qml:32
 msgid "Dismiss"
 msgstr "Dismiss"
 
@@ -388,19 +389,19 @@
 msgid "Container information for %1"
 msgstr "Container information for %1"
 
-#: ../libertine/qml/ContainerInfoView.qml:56
+#: ../libertine/qml/ContainerInfoView.qml:53
 msgid "ID"
 msgstr "ID"
 
-#: ../libertine/qml/ContainerInfoView.qml:64
+#: ../libertine/qml/ContainerInfoView.qml:60
 msgid "Name"
 msgstr "Name"
 
-#: ../libertine/qml/ContainerInfoView.qml:72
+#: ../libertine/qml/ContainerInfoView.qml:67
 msgid "Distribution"
 msgstr "Distribution"
 
-#: ../libertine/qml/ContainerInfoView.qml:80
+#: ../libertine/qml/ContainerInfoView.qml:74
 msgid "Status"
 msgstr "Status"
 
@@ -419,3 +420,41 @@
 #: ../libertine/qml/ContainerOptionsDialog.qml:56
 msgid "container name"
 msgstr "container name"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "add"
+
+#, fuzzy
+#~ msgid "Add Archive"
+#~ msgstr "Adding archive failed"
+
+#, fuzzy
+#~ msgid "Add a new archive"
+#~ msgstr "Add additional PPA"
+
+#, fuzzy
+#~ msgid "Additional Archives"
+#~ msgstr "Add additional PPA"
+
+#, fuzzy
+#~ msgid "Attempt to set container as default failed"
+#~ msgstr "Attempt to configure container %1 failed"
+
+#, fuzzy
+#~ msgid "Default container"
+#~ msgstr "Delete Container"
+
+#, fuzzy
+#~ msgid "Enter a name for the container or leave blank for default name:"
+#~ msgstr "Enter or name for the container or leave blank for default name"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enter password for your user in the Libertine container or leave blank "
+#~ "for no password:"
+#~ msgstr "Enter or name for the container or leave blank for default name"
+
+#, fuzzy
+#~ msgid "new archive name"
+#~ msgstr "Adding archive failed"
 
=== modified file 'po/en_US.po'
--- po/en_US.po	2016-06-10 12:07:31 +0000
+++ po/en_US.po	2016-07-21 17:26:05 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-07 07:58-0400\n"
+"POT-Creation-Date: 2016-07-15 14:24-0400\n"
 "PO-Revision-Date: 2016-03-21 10:21-0400\n"
 "Last-Translator: Chris Townsend <[e-mail]>\n"
 "Language-Team: English\n"
@@ -17,348 +17,332 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:184
-msgid "new"
-msgstr "new"
-
-#: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:185
-#: ../libertine/qml/ContainersView.qml:81 ../libertine/qml/HomeView.qml:197
-#: ../libertine/qml/ExtraArchivesView.qml:99
-msgid "installing"
-msgstr "installing"
-
-#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:119
-#: ../libertine/qml/ManageContainer.qml:79
-#: ../libertine/qml/ManageContainer.qml:119
-msgid "ready"
-msgstr "ready"
-
-#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:120
-#: ../libertine/qml/ManageContainer.qml:91
-#: ../libertine/qml/ManageContainer.qml:115
-msgid "updating"
-msgstr "updating"
-
-#: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
-#: ../libertine/qml/ContainersView.qml:82 ../libertine/qml/HomeView.qml:198
-#: ../libertine/qml/ExtraArchivesView.qml:100
-msgid "removing"
-msgstr "removing"
-
-#: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:189
-#: ../libertine/qml/PackageInfoView.qml:131
-#: ../libertine/qml/ContainerInfoView.qml:93
-msgid "removed"
-msgstr "removed"
-
-#: ../libertine/ContainerConfig.cpp:153 ../libertine/ContainerConfig.cpp:187
-msgid "failed"
-msgstr "failed"
-
-#: ../libertine/ContainerConfig.cpp:186
-msgid "installed"
-msgstr "installed"
-
-#: ../libertine/ContainerManager.cpp:24
+#: ../libertine/ContainerManager.cpp:25
 msgid "%1 failed to start"
 msgstr "%1 failed to start"
 
-#: ../libertine/ContainerManager.cpp:25
-msgid "Installation of package %1 failed"
-msgstr "Installation of package %1 failed"
-
-#: ../libertine/ContainerManager.cpp:26
-msgid "Removal of package %1 failed"
-msgstr "Removal of package %1 failed"
-
-#: ../libertine/ContainerManager.cpp:27
-msgid "Searching for query %1 failed"
-msgstr "Searching for query %1 failed"
-
-#: ../libertine/ContainerManager.cpp:28
-msgid "Updating container %1 failed"
-msgstr "Updating container %1 failed"
-
-#: ../libertine/ContainerManager.cpp:29
+#: ../libertine/qml/AddExtraArchiveView.qml:73
+msgid "(Optional) Public signing key for archive"
+msgstr ""
+
+#: ../libertine/qml/AddExtraArchiveView.qml:90
+#, fuzzy
+msgid "Add"
+msgstr "add"
+
+#: ../libertine/qml/AddExtraArchiveView.qml:27
+#, fuzzy
+msgid "Add Archive"
+msgstr "Adding archive failed"
+
+#: ../libertine/qml/ExtraArchivesView.qml:32
+#, fuzzy
+msgid "Add a new archive"
+msgstr "Add additional PPA"
+
+#: ../libertine/qml/ExtraArchivesView.qml:27
+#, fuzzy
+msgid "Additional Archives"
+msgstr "Add additional PPA"
+
+#: ../libertine/qml/ManageContainer.qml:73
+msgid "Additional archives and PPAs"
+msgstr "Additional archives and PPAs"
+
+#: ../libertine/ContainerManager.cpp:33
+msgid "Attempt to configure container %1 failed"
+msgstr "Attempt to configure container %1 failed"
+
+#: ../libertine/ContainerManager.cpp:34
+#, fuzzy
+msgid "Attempt to set container as default failed"
+msgstr "Attempt to configure container %1 failed"
+
+#: ../libertine/qml/DebianPackagePicker.qml:28
+msgid "Available Debian Packages to Install"
+msgstr "Available Debian Packages to Install"
+
+#: ../libertine/qml/SearchPackagesDialog.qml:57
+#: ../libertine/qml/HomeView.qml:88
+#: ../libertine/qml/ContainerOptionsDialog.qml:88
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../libertine/qml/HomeView.qml:143
+msgid "Choose Debian package to install"
+msgstr "Choose Debian package to install"
+
+#: ../libertine/qml/HomeView.qml:29
+msgid "Classic Apps - %1"
+msgstr "Classic Apps - %1"
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:28
+msgid "Configure options for container creation."
+msgstr "Configure options for container creation."
+
+#: ../libertine/qml/ContainersView.qml:116
+msgid "Container Apps"
+msgstr "Container Apps"
+
+#: ../libertine/qml/ContainersView.qml:107
+msgid "Container Info"
+msgstr "Container Info"
+
+#: ../libertine/qml/HomeView.qml:112
+msgid "Container Information"
+msgstr "Container Information"
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:27
+msgid "Container Options"
+msgstr "Container Options"
+
+#: ../libertine/qml/ContainerInfoView.qml:30
+msgid "Container information for %1"
+msgstr "Container information for %1"
+
+#: ../libertine/qml/GenericErrorDialog.qml:39
+msgid "Copy to Clipboard"
+msgstr ""
+
+#: ../libertine/ContainerManager.cpp:30
 msgid "Creating container %1 failed"
 msgstr "Creating container %1 failed"
 
-#: ../libertine/ContainerManager.cpp:30
+#: ../libertine/qml/ManageContainer.qml:117
+#, fuzzy
+msgid "Default container"
+msgstr "Delete Container"
+
+#: ../libertine/qml/ContainersView.qml:92
+msgid "Delete Container"
+msgstr "Delete Container"
+
+#: ../libertine/qml/ExtraArchivesView.qml:126
+msgid "Deleting archive failed"
+msgstr "Deleting archive failed"
+
+#: ../libertine/ContainerManager.cpp:31
 msgid "Destroying container %1 failed"
 msgstr "Destroying container %1 failed"
 
-#: ../libertine/ContainerManager.cpp:31
-msgid "Running command %1 failed"
-msgstr "Running command %1 failed"
-
-#: ../libertine/ContainerManager.cpp:32
-msgid "Attempt to configure container %1 failed"
-msgstr "Attempt to configure container %1 failed"
-
-#: ../libertine/qml/PackageExistsDialog.qml:28
-msgid "The %1 package is already installed."
-msgstr "The %1 package is already installed."
-
-#: .:./libertine/qml/PackageExistsDialog.qml:29
-msgid "Search again or return to search results."
-msgstr "Search again or return to search results."
-
-#: ../libertine/qml/PackageExistsDialog.qml:33
-msgid "Search again"
-msgstr "Search again"
-
-#: ../libertine/qml/PackageExistsDialog.qml:43
-msgid "Return to search results"
-msgstr "Return to search results"
+#: ../libertine/qml/GenericErrorDialog.qml:46
+msgid "Dismiss"
+msgstr "Dismiss"
+
+#: ../libertine/qml/ContainerInfoView.qml:72
+msgid "Distribution"
+msgstr "Distribution"
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:49
+#, fuzzy
+msgid "Enter a name for the container or leave blank for default name:"
+msgstr "Enter or name for the container or leave blank for default name"
+
+#: ../libertine/qml/HomeView.qml:49
+msgid "Enter exact package name or full path to a Debian package file"
+msgstr "Enter exact package name or full path to a Debian package file"
+
+#: ../libertine/qml/HomeView.qml:135
+msgid "Enter package name or Debian file"
+msgstr "Enter package name or Debian file"
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:62
+#, fuzzy
+msgid ""
+"Enter password for your user in the Libertine container or leave blank for "
+"no password:"
+msgstr "Enter or name for the container or leave blank for default name"
+
+#: ../libertine/qml/ContainerInfoView.qml:56
+msgid "ID"
+msgstr "ID"
+
+#: ../libertine/qml/PackageInfoView.qml:30
+msgid "Information for the %1 package"
+msgstr "Information for the %1 package"
+
+#: ../libertine/qml/WelcomeView.qml:66
+msgid "Install"
+msgstr "Install"
+
+#: ../libertine/qml/SearchResults.qml:60
+#: ../libertine/qml/DebianPackagePicker.qml:70
+msgid "Install Package"
+msgstr "Install Package"
+
+#: ../libertine/qml/HomeView.qml:48
+msgid "Install new package"
+msgstr "Install new package"
+
+#: ../libertine/qml/PackageInfoView.qml:68
+msgid "Install status"
+msgstr "Install status"
+
+#: ../libertine/ContainerManager.cpp:26
+msgid "Installation of package %1 failed"
+msgstr "Installation of package %1 failed"
+
+#: ../libertine/qml/ManageContainer.qml:29
+msgid "Manage %1"
+msgstr "Manage %1"
+
+#: ../libertine/qml/HomeView.qml:105
+msgid "Manage Container"
+msgstr "Manage Container"
 
 #: ../libertine/qml/ContainersView.qml:33
 msgid "My Containers"
 msgstr "My Containers"
 
-#: ../libertine/qml/ContainersView.qml:92 ../libertine/qml/HomeView.qml:210
-msgid "delete"
-msgstr "delete"
-
-#: ../libertine/qml/ContainersView.qml:93
-msgid "Delete Container"
-msgstr "Delete Container"
-
-#: ../libertine/qml/ContainersView.qml:108 ../libertine/qml/HomeView.qml:222
-msgid "info"
-msgstr "info"
-
-#: ../libertine/qml/ContainersView.qml:109
-msgid "Container Info"
-msgstr "Container Info"
-
-#: ../libertine/qml/ContainersView.qml:117
-msgid "edit"
-msgstr "edit"
-
-#: ../libertine/qml/ContainersView.qml:118
-msgid "Container Apps"
-msgstr "Container Apps"
-
-#: ../libertine/qml/SearchPackagesDialog.qml:26
-#: ../libertine/qml/SearchResultsView.qml:36
-msgid "Search for packages"
-msgstr "Search for packages"
-
-#: ../libertine/qml/SearchPackagesDialog.qml:27
-msgid "Search archives for packages"
-msgstr "Search archives for packages"
-
-#: ../libertine/qml/SearchPackagesDialog.qml:31
-msgid "search"
-msgstr "search"
+#: ../libertine/qml/ContainerInfoView.qml:64
+msgid "Name"
+msgstr "Name"
+
+#: ../libertine/qml/AddExtraArchiveView.qml:42
+msgid "New archive identifier, e.g."
+msgstr ""
+
+#: ../libertine/qml/DebianPackagePicker.qml:87
+msgid "No Debian packages available"
+msgstr "No Debian packages available"
+
+#: ../libertine/qml/SearchResultsView.qml:52
+msgid "No Search Results Found"
+msgstr "No Search Results Found"
+
+#: ../libertine/qml/ExtraArchivesView.qml:93
+msgid "No additional archives and PPA's have been added"
+msgstr "No additional archives and PPA's have been added"
+
+#: ../libertine/qml/HomeView.qml:248
+msgid "No packages are installed"
+msgstr "No packages are installed"
 
 #: ../libertine/qml/SearchPackagesDialog.qml:39
-#: ../libertine/qml/ContainerPasswordDialog.qml:52
-#: ../libertine/qml/HomeView.qml:68 ../libertine/qml/ExtraArchivesView.qml:57
-#: ../libertine/qml/ContainerOptionsDialog.qml:64
+#: ../libertine/qml/HomeView.qml:68
+#: ../libertine/qml/ContainerOptionsDialog.qml:77
 msgid "OK"
 msgstr "OK"
 
-#: ../libertine/qml/SearchPackagesDialog.qml:57
-#: ../libertine/qml/ContainerPasswordDialog.qml:70
-#: ../libertine/qml/HomeView.qml:88 ../libertine/qml/ExtraArchivesView.qml:65
-#: ../libertine/qml/ContainerOptionsDialog.qml:75
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../libertine/qml/PackageInfoView.qml:30
-msgid "Information for the %1 package"
-msgstr "Information for the %1 package"
-
 #: ../libertine/qml/PackageInfoView.qml:35
 msgid "Obtaining package version…"
 msgstr "Obtaining package version…"
 
-#: ../libertine/qml/PackageInfoView.qml:59
-msgid "Package version"
-msgstr "Package version"
-
-#: ../libertine/qml/PackageInfoView.qml:67
-msgid "Install status"
-msgstr "Install status"
-
-#: ../libertine/qml/PackageInfoView.qml:140
-msgid "Unknown"
-msgstr "Unknown"
+#: ../libertine/qml/PackageInfoView.qml:85
+#: ../libertine/qml/ContainerInfoView.qml:97
+msgid "Operation details"
+msgstr ""
+
+#: ../libertine/qml/HomeView.qml:231
+msgid "Package Info"
+msgstr "Package Info"
 
 #: ../libertine/qml/SearchResultsView.qml:31
 msgid "Package Search Results"
 msgstr "Package Search Results"
 
+#: ../libertine/qml/HomeView.qml:59
+msgid "Package name or Debian package path"
+msgstr "Package name or Debian package path"
+
+#: ../libertine/qml/PackageInfoView.qml:60
+msgid "Package version"
+msgstr "Package version"
+
+#: ../libertine/ContainerManager.cpp:27
+msgid "Removal of package %1 failed"
+msgstr "Removal of package %1 failed"
+
+#: ../libertine/qml/HomeView.qml:219
+msgid "Remove Package"
+msgstr "Remove Package"
+
+#: ../libertine/qml/ExtraArchivesView.qml:76
+msgid "Remove extra archive"
+msgstr "Remove extra archive"
+
+#: ../libertine/qml/SearchResultsView.qml:67
+msgid "Return to Apps Page"
+msgstr "Return to Apps Page"
+
+#: ../libertine/qml/PackageExistsDialog.qml:43
+msgid "Return to search results"
+msgstr "Return to search results"
+
+#: ../libertine/ContainerManager.cpp:32
+msgid "Running command %1 failed"
+msgstr "Running command %1 failed"
+
 #: ../libertine/qml/SearchResultsView.qml:35
 msgid "Search"
 msgstr "Search"
 
-#: ../libertine/qml/SearchResultsView.qml:52
-msgid "No Search Results Found"
-msgstr "No Search Results Found"
-
 #: ../libertine/qml/SearchResultsView.qml:57
 msgid "Search Again"
 msgstr "Search Again"
 
-#: ../libertine/qml/SearchResultsView.qml:67
-msgid "Return to Apps Page"
-msgstr "Return to Apps Page"
+#: ../libertine/qml/PackageExistsDialog.qml:33
+msgid "Search again"
+msgstr "Search again"
+
+#: ../libertine/qml/PackageExistsDialog.qml:29
+msgid "Search again or return to search results."
+msgstr "Search again or return to search results."
+
+#: ../libertine/qml/HomeView.qml:152
+msgid "Search archives for a package"
+msgstr "Search archives for a package"
+
+#: ../libertine/qml/SearchPackagesDialog.qml:27
+msgid "Search archives for packages"
+msgstr "Search archives for packages"
+
+#: ../libertine/qml/SearchPackagesDialog.qml:26
+#: ../libertine/qml/SearchResultsView.qml:36
+msgid "Search for packages"
+msgstr "Search for packages"
 
 #: ../libertine/qml/SearchResultsView.qml:95
 msgid "Searching for packages…"
 msgstr "Searching for packages…"
 
-#: ../libertine/qml/SearchResults.qml:60
-#: ../libertine/qml/DebianPackagePicker.qml:70
-msgid "Install Package"
-msgstr "Install Package"
-
-#: ../libertine/qml/ManageContainer.qml:29
-msgid "Manage %1"
-msgstr "Manage %1"
-
-#: ../libertine/qml/ManageContainer.qml:63
-#: ../libertine/qml/ContainerOptionsDialog.qml:40
-msgid "i386 multiarch support"
-msgstr "i386 multiarch support"
-
-#: ../libertine/qml/ManageContainer.qml:67
-msgid "Additional archives and PPAs"
-msgstr "Additional archives and PPAs"
-
-#: ../libertine/qml/ManageContainer.qml:78
+#: ../libertine/ContainerManager.cpp:28
+msgid "Searching for query %1 failed"
+msgstr "Searching for query %1 failed"
+
+#: ../libertine/qml/ContainerInfoView.qml:80
+msgid "Status"
+msgstr "Status"
+
+#: ../libertine/qml/HomeView.qml:119
+msgid "Switch Container"
+msgstr "Switch Container"
+
+#: ../libertine/qml/PackageExistsDialog.qml:28
+msgid "The %1 package is already installed."
+msgstr "The %1 package is already installed."
+
+#: ../libertine/qml/HomeView.qml:78
+msgid ""
+"The %1 package is already installed. Please try a different package name."
+msgstr ""
+"The %1 package is already installed. Please try a different package name."
+
+#: ../libertine/qml/PackageInfoView.qml:159
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../libertine/qml/ManageContainer.qml:100
+msgid "Update container"
+msgstr "Update container"
+
+#: ../libertine/qml/ManageContainer.qml:84
 msgid "Update…"
 msgstr "Update…"
 
-#: ../libertine/qml/ManageContainer.qml:94
-msgid "Update container"
-msgstr "Update container"
-
-#: ../libertine/qml/DebianPackagePicker.qml:28
-msgid "Available Debian Packages to Install"
-msgstr "Available Debian Packages to Install"
-
-#: ../libertine/qml/DebianPackagePicker.qml:87
-msgid "No Debian packages available"
-msgstr "No Debian packages available"
-
-#: ../libertine/qml/ContainerPasswordDialog.qml:27
-msgid "Authentication required"
-msgstr "Authentication required"
-
-#: ../libertine/qml/ContainerPasswordDialog.qml:28
-msgid "Password is required to create a Libertine container"
-msgstr "Password is required to create a Libertine container"
-
-#: ../libertine/qml/ContainerPasswordDialog.qml:36
-msgid "Invalid password entered"
-msgstr "Invalid password entered"
-
-#: ../libertine/qml/ContainerPasswordDialog.qml:41
-msgid "password"
-msgstr "password"
-
-#: ../libertine/qml/HomeView.qml:29
-msgid "Classic Apps - %1"
-msgstr "Classic Apps - %1"
-
-#: ../libertine/qml/HomeView.qml:48
-msgid "Install new package"
-msgstr "Install new package"
-
-#: ../libertine/qml/HomeView.qml:49
-msgid "Enter exact package name or full path to a Debian package file"
-msgstr "Enter exact package name or full path to a Debian package file"
-
-#: ../libertine/qml/HomeView.qml:59
-msgid "Package name or Debian package path"
-msgstr "Package name or Debian package path"
-
-#: ../libertine/qml/HomeView.qml:78
-msgid "The %1 package is already installed. Please try a different package name."
-msgstr "The %1 package is already installed. Please try a different package name."
-
-#: ../libertine/qml/HomeView.qml:104
-msgid "Manage Container"
-msgstr "Manage Container"
-
-#: ../libertine/qml/HomeView.qml:110
-msgid "Container Information"
-msgstr "Container Information"
-
-#: ../libertine/qml/HomeView.qml:116
-msgid "Switch Container"
-msgstr "Switch Container"
-
-#: ../libertine/qml/HomeView.qml:132
-msgid "Enter package name or Debian file"
-msgstr "Enter package name or Debian file"
-
-#: ../libertine/qml/HomeView.qml:138
-msgid "Choose Debian package to install"
-msgstr "Choose Debian package to install"
-
-#: ../libertine/qml/HomeView.qml:145
-msgid "Search archives for a package"
-msgstr "Search archives for a package"
-
-#: ../libertine/qml/HomeView.qml:211
-msgid "Remove Package"
-msgstr "Remove Package"
-
-#: ../libertine/qml/HomeView.qml:223
-msgid "Package Info"
-msgstr "Package Info"
-
-#: ../libertine/qml/HomeView.qml:240
-msgid "No packages are installed"
-msgstr "No packages are installed"
-
-#: ../libertine/qml/ExtraArchivesView.qml:28
-msgid "Additional Archives and PPAs"
-msgstr "Additional Archives and PPAs"
-
-#: ../libertine/qml/ExtraArchivesView.qml:32
-msgid "add"
-msgstr "add"
-
-#: ../libertine/qml/ExtraArchivesView.qml:33
-msgid "Add a new PPA"
-msgstr "Add a new PPA"
-
-#: ../libertine/qml/ExtraArchivesView.qml:46
-msgid "Add additional PPA"
-msgstr "Add additional PPA"
-
-#: ../libertine/qml/ExtraArchivesView.qml:47
-msgid "Enter name of PPA in the form ppa:user/ppa-name:"
-msgstr "Enter name of PPA in the form ppa:user/ppa-name:"
-
-#: ../libertine/qml/ExtraArchivesView.qml:107
-msgid "remove"
-msgstr "remove"
-
-#: ../libertine/qml/ExtraArchivesView.qml:108
-msgid "Remove extra archive"
-msgstr "Remove extra archive"
-
-#: ../libertine/qml/ExtraArchivesView.qml:125
-msgid "No additional archives and PPA's have been added"
-msgstr "No additional archives and PPA's have been added"
-
-#: ../libertine/qml/ExtraArchivesView.qml:173
-msgid "Adding archive failed"
-msgstr "Adding archive failed"
-
-#: ../libertine/qml/ExtraArchivesView.qml:177
-msgid "Deleting archive failed"
-msgstr "Deleting archive failed"
-
-#: ../libertine/qml/GenericErrorDialog.qml:32
-msgid "Dismiss"
-msgstr "Dismiss"
+#: ../libertine/ContainerManager.cpp:29
+msgid "Updating container %1 failed"
+msgstr "Updating container %1 failed"
 
 #: ../libertine/qml/WelcomeView.qml:28
 msgid "Welcome"
@@ -378,52 +362,110 @@
 "Downloading and setting up the required environment takes some time and "
 "network bandwidth."
 
-#: ../libertine/qml/WelcomeView.qml:66
-msgid "Install"
-msgstr "Install"
-
-#: ../libertine/qml/ContainerInfoView.qml:30
-msgid "Container information for %1"
-msgstr "Container information for %1"
-
-#: ../libertine/qml/ContainerInfoView.qml:53
-msgid "ID"
-msgstr "ID"
-
-#: ../libertine/qml/ContainerInfoView.qml:60
-msgid "Name"
-msgstr "Name"
-
-#: ../libertine/qml/ContainerInfoView.qml:67
-msgid "Distribution"
-msgstr "Distribution"
-
-#: ../libertine/qml/ContainerInfoView.qml:74
-msgid "Status"
-msgstr "Status"
-
-#: ../libertine/qml/ContainerOptionsDialog.qml:27
-msgid "Container Options"
-msgstr "Container Options"
-
-#: ../libertine/qml/ContainerOptionsDialog.qml:28
-msgid "Configure options for container creation."
-msgstr "Configure options for container creation."
-
-#: ../libertine/qml/ContainerOptionsDialog.qml:50
-msgid "Enter or name for the container or leave blank for default name"
-msgstr "Enter or name for the container or leave blank for default name"
-
-#: ../libertine/qml/ContainerOptionsDialog.qml:56
+#: ../libertine/qml/ExtraArchivesView.qml:31
+msgid "add"
+msgstr "add"
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:55
 msgid "container name"
 msgstr "container name"
 
+#: ../libertine/qml/ContainersView.qml:91 ../libertine/qml/HomeView.qml:218
+msgid "delete"
+msgstr "delete"
+
+#: ../libertine/qml/ContainersView.qml:115
+msgid "edit"
+msgstr "edit"
+
+#: ../libertine/ContainerConfig.cpp:153 ../libertine/ContainerConfig.cpp:187
+msgid "failed"
+msgstr "failed"
+
+#: ../libertine/qml/ManageContainer.qml:69
+#: ../libertine/qml/ContainerOptionsDialog.qml:39
+msgid "i386 multiarch support"
+msgstr "i386 multiarch support"
+
+#: ../libertine/qml/ContainersView.qml:106 ../libertine/qml/HomeView.qml:230
+msgid "info"
+msgstr "info"
+
+#: ../libertine/ContainerConfig.cpp:186
+msgid "installed"
+msgstr "installed"
+
+#: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:185
+#: ../libertine/qml/ContainersView.qml:80 ../libertine/qml/HomeView.qml:205
+#: ../libertine/qml/ExtraArchivesView.qml:67
+msgid "installing"
+msgstr "installing"
+
+#: ../libertine/qml/AddExtraArchiveView.qml:50
+msgid ""
+"multiverse\n"
+"ppa:user/repository\n"
+"deb http://myserver/repo stable repo"
+msgstr ""
+
+#: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:184
+msgid "new"
+msgstr "new"
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:69
+msgid "password"
+msgstr "password"
+
+#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:117
+#: ../libertine/qml/ManageContainer.qml:85
+#: ../libertine/qml/ManageContainer.qml:152
+msgid "ready"
+msgstr "ready"
+
+#: ../libertine/qml/ExtraArchivesView.qml:75
+msgid "remove"
+msgstr "remove"
+
+#: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:189
+#: ../libertine/qml/PackageInfoView.qml:148
+#: ../libertine/qml/ContainerInfoView.qml:143
+msgid "removed"
+msgstr "removed"
+
+#: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
+#: ../libertine/qml/ContainersView.qml:81 ../libertine/qml/HomeView.qml:206
+#: ../libertine/qml/ExtraArchivesView.qml:68
+msgid "removing"
+msgstr "removing"
+
+#: ../libertine/qml/SearchPackagesDialog.qml:31
+msgid "search"
+msgstr "search"
+
+#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:118
+#: ../libertine/qml/ManageContainer.qml:97
+#: ../libertine/qml/ManageContainer.qml:148
+msgid "updating"
+msgstr "updating"
+
+#~ msgid "Add a new PPA"
+#~ msgstr "Add a new PPA"
+
+#~ msgid "Additional Archives and PPAs"
+#~ msgstr "Additional Archives and PPAs"
+
+#~ msgid "Authentication required"
+#~ msgstr "Authentication required"
+
 #~ msgid "Configure %1"
 #~ msgstr "Configure %1"
 
 #~ msgid "Configure Container"
 #~ msgstr "Configure Container"
 
+#~ msgid "Enter name of PPA in the form ppa:user/ppa-name:"
+#~ msgstr "Enter name of PPA in the form ppa:user/ppa-name:"
+
 #, fuzzy
 #~ msgid "Failure %1 the %2 package."
 #~ msgstr "Information for the %1 package"
@@ -434,6 +476,12 @@
 #~ msgid "Install Apps"
 #~ msgstr "Install Apps"
 
+#~ msgid "Invalid password entered"
+#~ msgstr "Invalid password entered"
+
+#~ msgid "Password is required to create a Libertine container"
+#~ msgstr "Password is required to create a Libertine container"
+
 #~ msgid "Please enter a package name to search for:"
 #~ msgstr "Please enter a package name to search for:"
 
@@ -443,3 +491,7 @@
 #, fuzzy
 #~ msgid "finding information for"
 #~ msgstr "Container information for %1"
+
+#, fuzzy
+#~ msgid "new archive name"
+#~ msgstr "Adding archive failed"
 
=== modified file 'po/es.po'
--- po/es.po	2016-07-15 05:42:05 +0000
+++ po/es.po	2016-07-21 17:26:05 +0000
@@ -6,15 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libertine\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-06-07 07:58-0400\n"
 "PO-Revision-Date: 2016-06-12 08:23+0000\n"
 "Last-Translator: Adolfo Jayme <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-15 05:42+0000\n"
+"X-Launchpad-Export-Date: 2016-07-01 06:06+0000\n"
 "X-Generator: Launchpad (build 18115)\n"
 
 #: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:184
@@ -22,32 +23,32 @@
 msgstr "nuevo"
 
 #: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:185
-#: ../libertine/qml/ContainersView.qml:81
-#: ../libertine/qml/ExtraArchivesView.qml:106 ../libertine/qml/HomeView.qml:205
+#: ../libertine/qml/ContainersView.qml:81 ../libertine/qml/HomeView.qml:197
+#: ../libertine/qml/ExtraArchivesView.qml:99
 msgid "installing"
 msgstr "instalando"
 
-#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:118
-#: ../libertine/qml/ManageContainer.qml:85
-#: ../libertine/qml/ManageContainer.qml:152
+#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:119
+#: ../libertine/qml/ManageContainer.qml:79
+#: ../libertine/qml/ManageContainer.qml:119
 msgid "ready"
 msgstr "preparado"
 
-#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:119
-#: ../libertine/qml/ManageContainer.qml:97
-#: ../libertine/qml/ManageContainer.qml:148
+#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:120
+#: ../libertine/qml/ManageContainer.qml:91
+#: ../libertine/qml/ManageContainer.qml:115
 msgid "updating"
 msgstr "actualizando"
 
 #: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
-#: ../libertine/qml/ContainersView.qml:82
-#: ../libertine/qml/ExtraArchivesView.qml:107 ../libertine/qml/HomeView.qml:206
+#: ../libertine/qml/ContainersView.qml:82 ../libertine/qml/HomeView.qml:198
+#: ../libertine/qml/ExtraArchivesView.qml:100
 msgid "removing"
 msgstr "desinstalando"
 
 #: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:189
-#: ../libertine/qml/ContainerInfoView.qml:143
-#: ../libertine/qml/PackageInfoView.qml:148
+#: ../libertine/qml/PackageInfoView.qml:131
+#: ../libertine/qml/ContainerInfoView.qml:93
 msgid "removed"
 msgstr "desinstalado"
 
@@ -115,7 +116,7 @@
 msgid "My Containers"
 msgstr "Mis contenedores"
 
-#: ../libertine/qml/ContainersView.qml:92 ../libertine/qml/HomeView.qml:218
+#: ../libertine/qml/ContainersView.qml:92 ../libertine/qml/HomeView.qml:210
 msgid "delete"
 msgstr "eliminar"
 
@@ -123,19 +124,19 @@
 msgid "Delete Container"
 msgstr "Eliminar contenedor"
 
-#: ../libertine/qml/ContainersView.qml:107 ../libertine/qml/HomeView.qml:230
+#: ../libertine/qml/ContainersView.qml:108 ../libertine/qml/HomeView.qml:222
 msgid "info"
 msgstr "información"
 
-#: ../libertine/qml/ContainersView.qml:108
+#: ../libertine/qml/ContainersView.qml:109
 msgid "Container Info"
 msgstr "Información del contenedor"
 
-#: ../libertine/qml/ContainersView.qml:116
+#: ../libertine/qml/ContainersView.qml:117
 msgid "edit"
 msgstr "editar"
 
-#: ../libertine/qml/ContainersView.qml:117
+#: ../libertine/qml/ContainersView.qml:118
 msgid "Container Apps"
 msgstr "Aplicaciones del contenedor"
 
@@ -152,17 +153,17 @@
 msgid "search"
 msgstr "buscar"
 
+#: ../libertine/qml/SearchPackagesDialog.qml:39
+#: ../libertine/qml/ContainerPasswordDialog.qml:52
+#: ../libertine/qml/HomeView.qml:68 ../libertine/qml/ExtraArchivesView.qml:57
 #: ../libertine/qml/ContainerOptionsDialog.qml:64
-#: ../libertine/qml/ContainerPasswordDialog.qml:52
-#: ../libertine/qml/ExtraArchivesView.qml:64 ../libertine/qml/HomeView.qml:68
-#: ../libertine/qml/SearchPackagesDialog.qml:39
 msgid "OK"
 msgstr "Aceptar"
 
+#: ../libertine/qml/SearchPackagesDialog.qml:57
+#: ../libertine/qml/ContainerPasswordDialog.qml:70
+#: ../libertine/qml/HomeView.qml:88 ../libertine/qml/ExtraArchivesView.qml:65
 #: ../libertine/qml/ContainerOptionsDialog.qml:75
-#: ../libertine/qml/ContainerPasswordDialog.qml:70
-#: ../libertine/qml/ExtraArchivesView.qml:72 ../libertine/qml/HomeView.qml:88
-#: ../libertine/qml/SearchPackagesDialog.qml:57
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -174,15 +175,15 @@
 msgid "Obtaining package version…"
 msgstr "Obteniendo la versión del paquete…"
 
-#: ../libertine/qml/PackageInfoView.qml:60
+#: ../libertine/qml/PackageInfoView.qml:59
 msgid "Package version"
 msgstr "Versión del paquete"
 
-#: ../libertine/qml/PackageInfoView.qml:68
+#: ../libertine/qml/PackageInfoView.qml:67
 msgid "Install status"
 msgstr "Estado de la instalación"
 
-#: ../libertine/qml/PackageInfoView.qml:159
+#: ../libertine/qml/PackageInfoView.qml:140
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -210,8 +211,8 @@
 msgid "Searching for packages…"
 msgstr "Buscando paquetes…"
 
+#: ../libertine/qml/SearchResults.qml:60
 #: ../libertine/qml/DebianPackagePicker.qml:70
-#: ../libertine/qml/SearchResults.qml:60
 msgid "Install Package"
 msgstr "Instalar paquete"
 
@@ -219,20 +220,20 @@
 msgid "Manage %1"
 msgstr "Gestionar %1"
 
+#: ../libertine/qml/ManageContainer.qml:63
 #: ../libertine/qml/ContainerOptionsDialog.qml:40
-#: ../libertine/qml/ManageContainer.qml:69
 msgid "i386 multiarch support"
 msgstr "Compatibilidad con i386 multiarquitectura"
 
-#: ../libertine/qml/ManageContainer.qml:73
+#: ../libertine/qml/ManageContainer.qml:67
 msgid "Additional archives and PPAs"
 msgstr "Archivos y PPA adicionales"
 
-#: ../libertine/qml/ManageContainer.qml:84
+#: ../libertine/qml/ManageContainer.qml:78
 msgid "Update…"
 msgstr "Actualizar…"
 
-#: ../libertine/qml/ManageContainer.qml:100
+#: ../libertine/qml/ManageContainer.qml:94
 msgid "Update container"
 msgstr "Actualizar contenedor"
 
@@ -281,42 +282,41 @@
 #: ../libertine/qml/HomeView.qml:78
 msgid ""
 "The %1 package is already installed. Please try a different package name."
-msgstr ""
-"El paquete «%1» ya está instalado. Pruebe con otro nombre de paquete."
+msgstr "El paquete «%1» ya está instalado. Pruebe con otro nombre de paquete."
 
-#: ../libertine/qml/HomeView.qml:105
+#: ../libertine/qml/HomeView.qml:104
 msgid "Manage Container"
 msgstr "Gestionar contenedor"
 
-#: ../libertine/qml/HomeView.qml:112
+#: ../libertine/qml/HomeView.qml:110
 msgid "Container Information"
 msgstr "Información del contenedor"
 
-#: ../libertine/qml/HomeView.qml:119
+#: ../libertine/qml/HomeView.qml:116
 msgid "Switch Container"
 msgstr "Cambiar de contenedor"
 
-#: ../libertine/qml/HomeView.qml:135
+#: ../libertine/qml/HomeView.qml:132
 msgid "Enter package name or Debian file"
 msgstr "Escriba el nombre de un paquete o indique un archivo de Debian"
 
-#: ../libertine/qml/HomeView.qml:143
+#: ../libertine/qml/HomeView.qml:138
 msgid "Choose Debian package to install"
 msgstr "Elija el paquete de Debian que se instalará"
 
-#: ../libertine/qml/HomeView.qml:152
+#: ../libertine/qml/HomeView.qml:145
 msgid "Search archives for a package"
 msgstr "Buscar un paquete en los archivos"
 
-#: ../libertine/qml/HomeView.qml:219
+#: ../libertine/qml/HomeView.qml:211
 msgid "Remove Package"
 msgstr "Desinstalar paquete"
 
-#: ../libertine/qml/HomeView.qml:231
+#: ../libertine/qml/HomeView.qml:223
 msgid "Package Info"
 msgstr "Información del paquete"
 
-#: ../libertine/qml/HomeView.qml:248
+#: ../libertine/qml/HomeView.qml:240
 msgid "No packages are installed"
 msgstr "No hay ningún paquete instalado"
 
@@ -341,27 +341,27 @@
 msgstr ""
 "Escriba el nombre del PPA según el formato «ppa:usuario/nombre-de-ppa»:"
 
-#: ../libertine/qml/ExtraArchivesView.qml:114
+#: ../libertine/qml/ExtraArchivesView.qml:107
 msgid "remove"
 msgstr "quitar"
 
-#: ../libertine/qml/ExtraArchivesView.qml:115
+#: ../libertine/qml/ExtraArchivesView.qml:108
 msgid "Remove extra archive"
 msgstr "quitar archivo adicional"
 
-#: ../libertine/qml/ExtraArchivesView.qml:132
+#: ../libertine/qml/ExtraArchivesView.qml:125
 msgid "No additional archives and PPA's have been added"
 msgstr "No se ha añadido ningún archivo ni PPA adicional"
 
-#: ../libertine/qml/ExtraArchivesView.qml:177
+#: ../libertine/qml/ExtraArchivesView.qml:173
 msgid "Adding archive failed"
 msgstr "Falló la adición del archivo"
 
-#: ../libertine/qml/ExtraArchivesView.qml:181
+#: ../libertine/qml/ExtraArchivesView.qml:177
 msgid "Deleting archive failed"
 msgstr "Falló la eliminación del archivo"
 
-#: ../libertine/qml/GenericErrorDialog.qml:46
+#: ../libertine/qml/GenericErrorDialog.qml:32
 msgid "Dismiss"
 msgstr "Descartar"
 
@@ -392,19 +392,19 @@
 msgid "Container information for %1"
 msgstr "Información del contenedor «%1»"
 
-#: ../libertine/qml/ContainerInfoView.qml:56
+#: ../libertine/qml/ContainerInfoView.qml:53
 msgid "ID"
 msgstr "Id."
 
-#: ../libertine/qml/ContainerInfoView.qml:64
+#: ../libertine/qml/ContainerInfoView.qml:60
 msgid "Name"
 msgstr "Nombre"
 
-#: ../libertine/qml/ContainerInfoView.qml:72
+#: ../libertine/qml/ContainerInfoView.qml:67
 msgid "Distribution"
 msgstr "Distribución"
 
-#: ../libertine/qml/ContainerInfoView.qml:80
+#: ../libertine/qml/ContainerInfoView.qml:74
 msgid "Status"
 msgstr "Estado"
 
@@ -424,3 +424,45 @@
 #: ../libertine/qml/ContainerOptionsDialog.qml:56
 msgid "container name"
 msgstr "nombre del contenedor"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "añadir"
+
+#, fuzzy
+#~ msgid "Add Archive"
+#~ msgstr "Falló la adición del archivo"
+
+#, fuzzy
+#~ msgid "Add a new archive"
+#~ msgstr "Añadir un PPA adicional"
+
+#, fuzzy
+#~ msgid "Additional Archives"
+#~ msgstr "Añadir un PPA adicional"
+
+#, fuzzy
+#~ msgid "Attempt to set container as default failed"
+#~ msgstr "Falló el intento de configuración del contenedor «%1»"
+
+#, fuzzy
+#~ msgid "Default container"
+#~ msgstr "Eliminar contenedor"
+
+#, fuzzy
+#~ msgid "Enter a name for the container or leave blank for default name:"
+#~ msgstr ""
+#~ "Escriba el nombre del contenedor o déjelo vacío para usar el "
+#~ "predeterminado"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enter password for your user in the Libertine container or leave blank "
+#~ "for no password:"
+#~ msgstr ""
+#~ "Escriba el nombre del contenedor o déjelo vacío para usar el "
+#~ "predeterminado"
+
+#, fuzzy
+#~ msgid "new archive name"
+#~ msgstr "Falló la adición del archivo"
 
=== modified file 'po/it.po'
--- po/it.po	2016-07-15 05:42:05 +0000
+++ po/it.po	2016-07-21 17:26:05 +0000
@@ -6,15 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libertine\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-06-07 07:58-0400\n"
 "PO-Revision-Date: 2016-06-10 13:00+0000\n"
 "Last-Translator: Emanuele Antonio Faraone <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-15 05:42+0000\n"
+"X-Launchpad-Export-Date: 2016-07-01 06:06+0000\n"
 "X-Generator: Launchpad (build 18115)\n"
 
 #: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:184
@@ -22,32 +23,32 @@
 msgstr "nuovo"
 
 #: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:185
-#: ../libertine/qml/ContainersView.qml:81
-#: ../libertine/qml/ExtraArchivesView.qml:106 ../libertine/qml/HomeView.qml:205
+#: ../libertine/qml/ContainersView.qml:81 ../libertine/qml/HomeView.qml:197
+#: ../libertine/qml/ExtraArchivesView.qml:99
 msgid "installing"
 msgstr "installando"
 
-#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:118
-#: ../libertine/qml/ManageContainer.qml:85
-#: ../libertine/qml/ManageContainer.qml:152
+#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:119
+#: ../libertine/qml/ManageContainer.qml:79
+#: ../libertine/qml/ManageContainer.qml:119
 msgid "ready"
 msgstr "pronto"
 
-#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:119
-#: ../libertine/qml/ManageContainer.qml:97
-#: ../libertine/qml/ManageContainer.qml:148
+#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:120
+#: ../libertine/qml/ManageContainer.qml:91
+#: ../libertine/qml/ManageContainer.qml:115
 msgid "updating"
 msgstr "aggiornando"
 
 #: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
-#: ../libertine/qml/ContainersView.qml:82
-#: ../libertine/qml/ExtraArchivesView.qml:107 ../libertine/qml/HomeView.qml:206
+#: ../libertine/qml/ContainersView.qml:82 ../libertine/qml/HomeView.qml:198
+#: ../libertine/qml/ExtraArchivesView.qml:100
 msgid "removing"
 msgstr "rimozione"
 
 #: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:189
-#: ../libertine/qml/ContainerInfoView.qml:143
-#: ../libertine/qml/PackageInfoView.qml:148
+#: ../libertine/qml/PackageInfoView.qml:131
+#: ../libertine/qml/ContainerInfoView.qml:93
 msgid "removed"
 msgstr "rimosso"
 
@@ -115,7 +116,7 @@
 msgid "My Containers"
 msgstr "Miei Contenitori"
 
-#: ../libertine/qml/ContainersView.qml:92 ../libertine/qml/HomeView.qml:218
+#: ../libertine/qml/ContainersView.qml:92 ../libertine/qml/HomeView.qml:210
 msgid "delete"
 msgstr "elimina"
 
@@ -123,19 +124,19 @@
 msgid "Delete Container"
 msgstr "Elimina Contenitore"
 
-#: ../libertine/qml/ContainersView.qml:107 ../libertine/qml/HomeView.qml:230
+#: ../libertine/qml/ContainersView.qml:108 ../libertine/qml/HomeView.qml:222
 msgid "info"
 msgstr "Informazioni"
 
-#: ../libertine/qml/ContainersView.qml:108
+#: ../libertine/qml/ContainersView.qml:109
 msgid "Container Info"
 msgstr "Informazioni Contenitore"
 
-#: ../libertine/qml/ContainersView.qml:116
+#: ../libertine/qml/ContainersView.qml:117
 msgid "edit"
 msgstr "modifica"
 
-#: ../libertine/qml/ContainersView.qml:117
+#: ../libertine/qml/ContainersView.qml:118
 msgid "Container Apps"
 msgstr "Contenitori App"
 
@@ -152,17 +153,17 @@
 msgid "search"
 msgstr "Cerca"
 
+#: ../libertine/qml/SearchPackagesDialog.qml:39
+#: ../libertine/qml/ContainerPasswordDialog.qml:52
+#: ../libertine/qml/HomeView.qml:68 ../libertine/qml/ExtraArchivesView.qml:57
 #: ../libertine/qml/ContainerOptionsDialog.qml:64
-#: ../libertine/qml/ContainerPasswordDialog.qml:52
-#: ../libertine/qml/ExtraArchivesView.qml:64 ../libertine/qml/HomeView.qml:68
-#: ../libertine/qml/SearchPackagesDialog.qml:39
 msgid "OK"
 msgstr "Ok"
 
+#: ../libertine/qml/SearchPackagesDialog.qml:57
+#: ../libertine/qml/ContainerPasswordDialog.qml:70
+#: ../libertine/qml/HomeView.qml:88 ../libertine/qml/ExtraArchivesView.qml:65
 #: ../libertine/qml/ContainerOptionsDialog.qml:75
-#: ../libertine/qml/ContainerPasswordDialog.qml:70
-#: ../libertine/qml/ExtraArchivesView.qml:72 ../libertine/qml/HomeView.qml:88
-#: ../libertine/qml/SearchPackagesDialog.qml:57
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -174,15 +175,15 @@
 msgid "Obtaining package version…"
 msgstr ""
 
-#: ../libertine/qml/PackageInfoView.qml:60
+#: ../libertine/qml/PackageInfoView.qml:59
 msgid "Package version"
 msgstr "Versione pacchetto"
 
-#: ../libertine/qml/PackageInfoView.qml:68
+#: ../libertine/qml/PackageInfoView.qml:67
 msgid "Install status"
 msgstr "Stato installazione"
 
-#: ../libertine/qml/PackageInfoView.qml:159
+#: ../libertine/qml/PackageInfoView.qml:140
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -210,8 +211,8 @@
 msgid "Searching for packages…"
 msgstr "Cercando nei pacchetti..."
 
+#: ../libertine/qml/SearchResults.qml:60
 #: ../libertine/qml/DebianPackagePicker.qml:70
-#: ../libertine/qml/SearchResults.qml:60
 msgid "Install Package"
 msgstr "Installa pacchetto"
 
@@ -219,20 +220,20 @@
 msgid "Manage %1"
 msgstr ""
 
+#: ../libertine/qml/ManageContainer.qml:63
 #: ../libertine/qml/ContainerOptionsDialog.qml:40
-#: ../libertine/qml/ManageContainer.qml:69
 msgid "i386 multiarch support"
 msgstr "Supporto i386 multiarchitettura"
 
-#: ../libertine/qml/ManageContainer.qml:73
+#: ../libertine/qml/ManageContainer.qml:67
 msgid "Additional archives and PPAs"
 msgstr "Archivi e PPA addizionali"
 
-#: ../libertine/qml/ManageContainer.qml:84
+#: ../libertine/qml/ManageContainer.qml:78
 msgid "Update…"
 msgstr "Aggiorno..."
 
-#: ../libertine/qml/ManageContainer.qml:100
+#: ../libertine/qml/ManageContainer.qml:94
 msgid "Update container"
 msgstr "Aggiorna contenitore"
 
@@ -281,39 +282,39 @@
 "The %1 package is already installed. Please try a different package name."
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:105
+#: ../libertine/qml/HomeView.qml:104
 msgid "Manage Container"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:112
+#: ../libertine/qml/HomeView.qml:110
 msgid "Container Information"
 msgstr "Informazioni Contenitore"
 
-#: ../libertine/qml/HomeView.qml:119
+#: ../libertine/qml/HomeView.qml:116
 msgid "Switch Container"
 msgstr "Cambia contenitore"
 
-#: ../libertine/qml/HomeView.qml:135
+#: ../libertine/qml/HomeView.qml:132
 msgid "Enter package name or Debian file"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:143
+#: ../libertine/qml/HomeView.qml:138
 msgid "Choose Debian package to install"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:152
+#: ../libertine/qml/HomeView.qml:145
 msgid "Search archives for a package"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:219
+#: ../libertine/qml/HomeView.qml:211
 msgid "Remove Package"
 msgstr "Rimuovi pacchetto"
 
-#: ../libertine/qml/HomeView.qml:231
+#: ../libertine/qml/HomeView.qml:223
 msgid "Package Info"
 msgstr "Informazioni pacchetto"
 
-#: ../libertine/qml/HomeView.qml:248
+#: ../libertine/qml/HomeView.qml:240
 msgid "No packages are installed"
 msgstr "Nessun pacchetto installato"
 
@@ -337,27 +338,27 @@
 msgid "Enter name of PPA in the form ppa:user/ppa-name:"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:114
+#: ../libertine/qml/ExtraArchivesView.qml:107
 msgid "remove"
 msgstr "rimuovi"
 
-#: ../libertine/qml/ExtraArchivesView.qml:115
+#: ../libertine/qml/ExtraArchivesView.qml:108
 msgid "Remove extra archive"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:132
+#: ../libertine/qml/ExtraArchivesView.qml:125
 msgid "No additional archives and PPA's have been added"
 msgstr ""
 
+#: ../libertine/qml/ExtraArchivesView.qml:173
+msgid "Adding archive failed"
+msgstr ""
+
 #: ../libertine/qml/ExtraArchivesView.qml:177
-msgid "Adding archive failed"
-msgstr ""
-
-#: ../libertine/qml/ExtraArchivesView.qml:181
 msgid "Deleting archive failed"
 msgstr ""
 
-#: ../libertine/qml/GenericErrorDialog.qml:46
+#: ../libertine/qml/GenericErrorDialog.qml:32
 msgid "Dismiss"
 msgstr "Declina"
 
@@ -384,19 +385,19 @@
 msgid "Container information for %1"
 msgstr ""
 
-#: ../libertine/qml/ContainerInfoView.qml:56
+#: ../libertine/qml/ContainerInfoView.qml:53
 msgid "ID"
 msgstr "ID"
 
-#: ../libertine/qml/ContainerInfoView.qml:64
+#: ../libertine/qml/ContainerInfoView.qml:60
 msgid "Name"
 msgstr "Nome"
 
-#: ../libertine/qml/ContainerInfoView.qml:72
+#: ../libertine/qml/ContainerInfoView.qml:67
 msgid "Distribution"
 msgstr "Distribuzione"
 
-#: ../libertine/qml/ContainerInfoView.qml:80
+#: ../libertine/qml/ContainerInfoView.qml:74
 msgid "Status"
 msgstr "Stato"
 
@@ -415,3 +416,27 @@
 #: ../libertine/qml/ContainerOptionsDialog.qml:56
 msgid "container name"
 msgstr "nome contenitore"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "aggiungi"
+
+#, fuzzy
+#~ msgid "Add Archive"
+#~ msgstr "Aggiungi PPA addizionale"
+
+#, fuzzy
+#~ msgid "Add a new archive"
+#~ msgstr "Aggiungi PPA addizionale"
+
+#, fuzzy
+#~ msgid "Additional Archives"
+#~ msgstr "Aggiungi PPA addizionale"
+
+#, fuzzy
+#~ msgid "Default container"
+#~ msgstr "Elimina Contenitore"
+
+#, fuzzy
+#~ msgid "new archive name"
+#~ msgstr "nome contenitore"
 
=== modified file 'po/libertine.pot'
--- po/libertine.pot	2016-06-10 12:07:31 +0000
+++ po/libertine.pot	2016-07-21 17:26:05 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-07 07:58-0400\n"
+"POT-Creation-Date: 2016-07-15 14:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -22,32 +22,32 @@
 msgstr ""
 
 #: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:185
-#: ../libertine/qml/ContainersView.qml:81 ../libertine/qml/HomeView.qml:197
-#: ../libertine/qml/ExtraArchivesView.qml:99
+#: ../libertine/qml/ContainersView.qml:80 ../libertine/qml/HomeView.qml:205
+#: ../libertine/qml/ExtraArchivesView.qml:67
 msgid "installing"
 msgstr ""
 
-#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:119
-#: ../libertine/qml/ManageContainer.qml:79
-#: ../libertine/qml/ManageContainer.qml:119
+#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:117
+#: ../libertine/qml/ManageContainer.qml:85
+#: ../libertine/qml/ManageContainer.qml:152
 msgid "ready"
 msgstr ""
 
-#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:120
-#: ../libertine/qml/ManageContainer.qml:91
-#: ../libertine/qml/ManageContainer.qml:115
+#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:118
+#: ../libertine/qml/ManageContainer.qml:97
+#: ../libertine/qml/ManageContainer.qml:148
 msgid "updating"
 msgstr ""
 
 #: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
-#: ../libertine/qml/ContainersView.qml:82 ../libertine/qml/HomeView.qml:198
-#: ../libertine/qml/ExtraArchivesView.qml:100
+#: ../libertine/qml/ContainersView.qml:81 ../libertine/qml/HomeView.qml:206
+#: ../libertine/qml/ExtraArchivesView.qml:68
 msgid "removing"
 msgstr ""
 
 #: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:189
-#: ../libertine/qml/PackageInfoView.qml:131
-#: ../libertine/qml/ContainerInfoView.qml:93
+#: ../libertine/qml/PackageInfoView.qml:148
+#: ../libertine/qml/ContainerInfoView.qml:143
 msgid "removed"
 msgstr ""
 
@@ -59,42 +59,46 @@
 msgid "installed"
 msgstr ""
 
-#: ../libertine/ContainerManager.cpp:24
+#: ../libertine/ContainerManager.cpp:25
 msgid "%1 failed to start"
 msgstr ""
 
-#: ../libertine/ContainerManager.cpp:25
+#: ../libertine/ContainerManager.cpp:26
 msgid "Installation of package %1 failed"
 msgstr ""
 
-#: ../libertine/ContainerManager.cpp:26
+#: ../libertine/ContainerManager.cpp:27
 msgid "Removal of package %1 failed"
 msgstr ""
 
-#: ../libertine/ContainerManager.cpp:27
+#: ../libertine/ContainerManager.cpp:28
 msgid "Searching for query %1 failed"
 msgstr ""
 
-#: ../libertine/ContainerManager.cpp:28
+#: ../libertine/ContainerManager.cpp:29
 msgid "Updating container %1 failed"
 msgstr ""
 
-#: ../libertine/ContainerManager.cpp:29
+#: ../libertine/ContainerManager.cpp:30
 msgid "Creating container %1 failed"
 msgstr ""
 
-#: ../libertine/ContainerManager.cpp:30
+#: ../libertine/ContainerManager.cpp:31
 msgid "Destroying container %1 failed"
 msgstr ""
 
-#: ../libertine/ContainerManager.cpp:31
+#: ../libertine/ContainerManager.cpp:32
 msgid "Running command %1 failed"
 msgstr ""
 
-#: ../libertine/ContainerManager.cpp:32
+#: ../libertine/ContainerManager.cpp:33
 msgid "Attempt to configure container %1 failed"
 msgstr ""
 
+#: ../libertine/ContainerManager.cpp:34
+msgid "Attempt to set container as default failed"
+msgstr ""
+
 #: ../libertine/qml/PackageExistsDialog.qml:28
 msgid "The %1 package is already installed."
 msgstr ""
@@ -115,27 +119,27 @@
 msgid "My Containers"
 msgstr ""
 
-#: ../libertine/qml/ContainersView.qml:92 ../libertine/qml/HomeView.qml:210
+#: ../libertine/qml/ContainersView.qml:91 ../libertine/qml/HomeView.qml:218
 msgid "delete"
 msgstr ""
 
-#: ../libertine/qml/ContainersView.qml:93
+#: ../libertine/qml/ContainersView.qml:92
 msgid "Delete Container"
 msgstr ""
 
-#: ../libertine/qml/ContainersView.qml:108 ../libertine/qml/HomeView.qml:222
+#: ../libertine/qml/ContainersView.qml:106 ../libertine/qml/HomeView.qml:230
 msgid "info"
 msgstr ""
 
-#: ../libertine/qml/ContainersView.qml:109
+#: ../libertine/qml/ContainersView.qml:107
 msgid "Container Info"
 msgstr ""
 
-#: ../libertine/qml/ContainersView.qml:117
+#: ../libertine/qml/ContainersView.qml:115
 msgid "edit"
 msgstr ""
 
-#: ../libertine/qml/ContainersView.qml:118
+#: ../libertine/qml/ContainersView.qml:116
 msgid "Container Apps"
 msgstr ""
 
@@ -153,16 +157,14 @@
 msgstr ""
 
 #: ../libertine/qml/SearchPackagesDialog.qml:39
-#: ../libertine/qml/ContainerPasswordDialog.qml:52
-#: ../libertine/qml/HomeView.qml:68 ../libertine/qml/ExtraArchivesView.qml:57
-#: ../libertine/qml/ContainerOptionsDialog.qml:64
+#: ../libertine/qml/HomeView.qml:68
+#: ../libertine/qml/ContainerOptionsDialog.qml:77
 msgid "OK"
 msgstr ""
 
 #: ../libertine/qml/SearchPackagesDialog.qml:57
-#: ../libertine/qml/ContainerPasswordDialog.qml:70
-#: ../libertine/qml/HomeView.qml:88 ../libertine/qml/ExtraArchivesView.qml:65
-#: ../libertine/qml/ContainerOptionsDialog.qml:75
+#: ../libertine/qml/HomeView.qml:88
+#: ../libertine/qml/ContainerOptionsDialog.qml:88
 msgid "Cancel"
 msgstr ""
 
@@ -174,15 +176,20 @@
 msgid "Obtaining package version…"
 msgstr ""
 
-#: ../libertine/qml/PackageInfoView.qml:59
+#: ../libertine/qml/PackageInfoView.qml:60
 msgid "Package version"
 msgstr ""
 
-#: ../libertine/qml/PackageInfoView.qml:67
+#: ../libertine/qml/PackageInfoView.qml:68
 msgid "Install status"
 msgstr ""
 
-#: ../libertine/qml/PackageInfoView.qml:140
+#: ../libertine/qml/PackageInfoView.qml:85
+#: ../libertine/qml/ContainerInfoView.qml:97
+msgid "Operation details"
+msgstr ""
+
+#: ../libertine/qml/PackageInfoView.qml:159
 msgid "Unknown"
 msgstr ""
 
@@ -219,23 +226,27 @@
 msgid "Manage %1"
 msgstr ""
 
-#: ../libertine/qml/ManageContainer.qml:63
-#: ../libertine/qml/ContainerOptionsDialog.qml:40
+#: ../libertine/qml/ManageContainer.qml:69
+#: ../libertine/qml/ContainerOptionsDialog.qml:39
 msgid "i386 multiarch support"
 msgstr ""
 
-#: ../libertine/qml/ManageContainer.qml:67
+#: ../libertine/qml/ManageContainer.qml:73
 msgid "Additional archives and PPAs"
 msgstr ""
 
-#: ../libertine/qml/ManageContainer.qml:78
+#: ../libertine/qml/ManageContainer.qml:84
 msgid "Update…"
 msgstr ""
 
-#: ../libertine/qml/ManageContainer.qml:94
+#: ../libertine/qml/ManageContainer.qml:100
 msgid "Update container"
 msgstr ""
 
+#: ../libertine/qml/ManageContainer.qml:117
+msgid "Default container"
+msgstr ""
+
 #: ../libertine/qml/DebianPackagePicker.qml:28
 msgid "Available Debian Packages to Install"
 msgstr ""
@@ -244,22 +255,6 @@
 msgid "No Debian packages available"
 msgstr ""
 
-#: ../libertine/qml/ContainerPasswordDialog.qml:27
-msgid "Authentication required"
-msgstr ""
-
-#: ../libertine/qml/ContainerPasswordDialog.qml:28
-msgid "Password is required to create a Libertine container"
-msgstr ""
-
-#: ../libertine/qml/ContainerPasswordDialog.qml:36
-msgid "Invalid password entered"
-msgstr ""
-
-#: ../libertine/qml/ContainerPasswordDialog.qml:41
-msgid "password"
-msgstr ""
-
 #: ../libertine/qml/HomeView.qml:29
 msgid "Classic Apps - %1"
 msgstr ""
@@ -281,83 +276,75 @@
 "The %1 package is already installed. Please try a different package name."
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:104
+#: ../libertine/qml/HomeView.qml:105
 msgid "Manage Container"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:110
+#: ../libertine/qml/HomeView.qml:112
 msgid "Container Information"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:116
+#: ../libertine/qml/HomeView.qml:119
 msgid "Switch Container"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:132
+#: ../libertine/qml/HomeView.qml:135
 msgid "Enter package name or Debian file"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:138
+#: ../libertine/qml/HomeView.qml:143
 msgid "Choose Debian package to install"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:145
+#: ../libertine/qml/HomeView.qml:152
 msgid "Search archives for a package"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:211
+#: ../libertine/qml/HomeView.qml:219
 msgid "Remove Package"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:223
+#: ../libertine/qml/HomeView.qml:231
 msgid "Package Info"
 msgstr ""
 
-#: ../libertine/qml/HomeView.qml:240
+#: ../libertine/qml/HomeView.qml:248
 msgid "No packages are installed"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:28
-msgid "Additional Archives and PPAs"
+#: ../libertine/qml/ExtraArchivesView.qml:27
+msgid "Additional Archives"
+msgstr ""
+
+#: ../libertine/qml/ExtraArchivesView.qml:31
+msgid "add"
 msgstr ""
 
 #: ../libertine/qml/ExtraArchivesView.qml:32
-msgid "add"
-msgstr ""
-
-#: ../libertine/qml/ExtraArchivesView.qml:33
-msgid "Add a new PPA"
-msgstr ""
-
-#: ../libertine/qml/ExtraArchivesView.qml:46
-msgid "Add additional PPA"
-msgstr ""
-
-#: ../libertine/qml/ExtraArchivesView.qml:47
-msgid "Enter name of PPA in the form ppa:user/ppa-name:"
-msgstr ""
-
-#: ../libertine/qml/ExtraArchivesView.qml:107
+msgid "Add a new archive"
+msgstr ""
+
+#: ../libertine/qml/ExtraArchivesView.qml:75
 msgid "remove"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:108
+#: ../libertine/qml/ExtraArchivesView.qml:76
 msgid "Remove extra archive"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:125
+#: ../libertine/qml/ExtraArchivesView.qml:93
 msgid "No additional archives and PPA's have been added"
 msgstr ""
 
-#: ../libertine/qml/ExtraArchivesView.qml:173
-msgid "Adding archive failed"
-msgstr ""
-
-#: ../libertine/qml/ExtraArchivesView.qml:177
+#: ../libertine/qml/ExtraArchivesView.qml:126
 msgid "Deleting archive failed"
 msgstr ""
 
-#: ../libertine/qml/GenericErrorDialog.qml:32
+#: ../libertine/qml/GenericErrorDialog.qml:39
+msgid "Copy to Clipboard"
+msgstr ""
+
+#: ../libertine/qml/GenericErrorDialog.qml:46
 msgid "Dismiss"
 msgstr ""
 
@@ -384,22 +371,45 @@
 msgid "Container information for %1"
 msgstr ""
 
-#: ../libertine/qml/ContainerInfoView.qml:53
+#: ../libertine/qml/ContainerInfoView.qml:56
 msgid "ID"
 msgstr ""
 
-#: ../libertine/qml/ContainerInfoView.qml:60
+#: ../libertine/qml/ContainerInfoView.qml:64
 msgid "Name"
 msgstr ""
 
-#: ../libertine/qml/ContainerInfoView.qml:67
+#: ../libertine/qml/ContainerInfoView.qml:72
 msgid "Distribution"
 msgstr ""
 
-#: ../libertine/qml/ContainerInfoView.qml:74
+#: ../libertine/qml/ContainerInfoView.qml:80
 msgid "Status"
 msgstr ""
 
+#: ../libertine/qml/AddExtraArchiveView.qml:27
+msgid "Add Archive"
+msgstr ""
+
+#: ../libertine/qml/AddExtraArchiveView.qml:42
+msgid "New archive identifier, e.g."
+msgstr ""
+
+#: ../libertine/qml/AddExtraArchiveView.qml:50
+msgid ""
+"multiverse\n"
+"ppa:user/repository\n"
+"deb http://myserver/repo stable repo"
+msgstr ""
+
+#: ../libertine/qml/AddExtraArchiveView.qml:73
+msgid "(Optional) Public signing key for archive"
+msgstr ""
+
+#: ../libertine/qml/AddExtraArchiveView.qml:90
+msgid "Add"
+msgstr ""
+
 #: ../libertine/qml/ContainerOptionsDialog.qml:27
 msgid "Container Options"
 msgstr ""
@@ -408,10 +418,20 @@
 msgid "Configure options for container creation."
 msgstr ""
 
-#: ../libertine/qml/ContainerOptionsDialog.qml:50
-msgid "Enter or name for the container or leave blank for default name"
+#: ../libertine/qml/ContainerOptionsDialog.qml:49
+msgid "Enter a name for the container or leave blank for default name:"
 msgstr ""
 
-#: ../libertine/qml/ContainerOptionsDialog.qml:56
+#: ../libertine/qml/ContainerOptionsDialog.qml:55
 msgid "container name"
 msgstr ""
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:62
+msgid ""
+"Enter password for your user in the Libertine container or leave blank for "
+"no password:"
+msgstr ""
+
+#: ../libertine/qml/ContainerOptionsDialog.qml:69
+msgid "password"
+msgstr ""
 
=== modified file 'python/libertine/ContainersConfig.py'
--- python/libertine/ContainersConfig.py	2016-06-27 20:32:33 +0000
+++ python/libertine/ContainersConfig.py	2016-07-21 17:26:05 +0000
@@ -115,7 +115,7 @@
             if item[object_key] == value:
                 container[array_key].remove(item)
                 write_container_config_file(self.container_list)
-                return    
+                return
 
     def _test_key_value_exists(self, container_id, key, value=None):
         key_value = self._get_value_by_key(container_id, key)
@@ -149,7 +149,7 @@
             if container['id'] == container_id:
                 return container
 
-        return None 
+        return None
 
     def merge_container_config_files(self, filepath):
         merged_json = []
@@ -199,7 +199,7 @@
         self.container_list.pop('defaultContainer', None)
 
         if write_json:
-            write_container_config_file(self.container_list)        
+            write_container_config_file(self.container_list)
 
     """
     Operations for the container itself.
@@ -261,7 +261,7 @@
     """
     def add_container_archive(self, container_id, archive_name):
         archive_obj = {'archiveName': archive_name, 'archiveStatus': 'new'}
-        self._set_value_by_key(container_id, 'extraArchives', archive_obj) 
+        self._set_value_by_key(container_id, 'extraArchives', archive_obj)
 
     def delete_container_archive(self, container_id, archive_name):
         self._delete_array_object_by_key_value(container_id, 'extraArchives',
@@ -271,6 +271,10 @@
         self._set_array_object_value_by_key(container_id, 'extraArchives', 'archiveName',
                                             archive_name, 'archiveStatus', new_status)
 
+    def get_archive_install_status(self, container_id, archive_name):
+        return self._get_array_object_value_by_key(container_id, 'extraArchives', 'archiveName',
+                                            archive_name, 'archiveStatus')
+
     def archive_exists(self, container_id, archive_name):
         return self._test_array_object_key_value_exists(container_id, 'extraArchives', 'archiveName',
                                                         archive_name)
@@ -306,4 +310,3 @@
 
     def get_container_type(self, container_id):
         return self._get_value_by_key(container_id, 'type')
-
 
=== modified file 'python/libertine/Libertine.py'
--- python/libertine/Libertine.py	2016-07-07 15:59:49 +0000
+++ python/libertine/Libertine.py	2016-07-21 17:26:05 +0000
@@ -18,7 +18,9 @@
 import contextlib
 import libertine.utils
 import os
+import psutil
 import shutil
+import shlex
 
 from libertine.ContainersConfig import ContainersConfig
 from libertine.HostInfo import HostInfo
@@ -61,7 +63,6 @@
         self.root_path = libertine.utils.get_libertine_container_rootfs_path(self.container_id)
         self.default_packages = ['matchbox',
                                  'libnss-extrausers',
-                                 'software-properties-common',
                                  'humanity-icon-theme',
                                  'maliit-inputcontext-gtk2',
                                  'maliit-inputcontext-gtk3',
@@ -161,32 +162,52 @@
                 os.environ['DEBIAN_FRONTEND'] = 'readline'
             return self.run_in_container(apt_command_prefix(verbosity) + " install '" + package_name + "'") == 0
 
-    def configure_command(self, command, *args, verbosity=1):
-        """
-        Configures the container based on what the command is.
-
-        :param command: The configuration command to run.
-        :param *args: List of arguments used for the given configuration command
-        """
-        if command == 'multiarch':
-            if args[0] == 'enable':
-                ret = self.run_in_container("dpkg --add-architecture i386")
-                if ret or ret == 0:
-                    self.run_in_container(apt_command_prefix(verbosity) + '--force-yes update')
-                return ret
-            else:
-                self.run_in_container(apt_command_prefix(verbosity) + "purge \".*:i386\"")
-                return self.run_in_container("dpkg --remove-architecture i386")
-
-        elif command == 'add-archive':
-            if not os.path.exists(os.path.join(self.root_path, 'usr', 'bin', 'add-apt-repository')):
-                self.update_packages(verbosity)
-                self.install_package("software-properties-common", verbosity)
-
-            return self.run_in_container("add-apt-repository -y " + args[0])
-
-        elif command == 'delete-archive':
-            return self.run_in_container("add-apt-repository -y -r " + args[0])
+    def configure_multiarch(self, should_enable, verbosity=1):
+        """
+        Enables or disables multiarch repositories.
+
+        :param should_enable: Whether or not to enable multiarch support.
+        :param verbosity: the chattiness of the output on a range from 0 to 2
+        """
+        if should_enable:
+            ret = self.run_in_container("dpkg --add-architecture i386")
+            if ret or ret == 0:
+                self.run_in_container(apt_command_prefix(verbosity) + '--force-yes update')
+            return ret
+        else:
+            self.run_in_container(apt_command_prefix(verbosity) + "purge \".*:i386\"")
+            return self.run_in_container("dpkg --remove-architecture i386")
+
+    def configure_add_archive(self, archive, public_key_file, verbosity=1):
+        """
+        Adds the given archive. If this archive requires a key, prompt user.
+
+        :param archive: The configuration command to run.
+        :param public_key_file: file containing the public key used to sign this archive
+        :param verbosity: the chattiness of the output on a range from 0 to 2
+        """
+        if not os.path.exists(os.path.join(self.root_path, 'usr', 'bin', 'add-apt-repository')):
+            self.update_packages(verbosity)
+            self.install_package("software-properties-common", verbosity)
+        if 'https://' in archive and not os.path.exists(os.path.join(self.root_path, 'usr', 'lib', 'apt', 'methods', 'https')):
+            self.update_packages(verbosity)
+            self.install_package("apt-transport-https", verbosity)
+
+        retcode = self.run_in_container("add-apt-repository -y " + archive)
+        if retcode is 0 and public_key_file is not None:
+            with open(public_key_file, 'r') as keyfile:
+                return self.run_in_container("bash -c 'echo \"%s\" | apt-key add -'" % keyfile.read())
+
+        return retcode
+
+    def configure_remove_archive(self, archive, verbosity=1):
+        """
+        Removes the given archive.
+
+        :param archive: The configuration command to run.
+        :param verbosity: the chattiness of the output on a range from 0 to 2
+        """
+        return self.run_in_container("add-apt-repository -y -r " + archive)
 
     @property
     def name(self):
@@ -247,7 +268,9 @@
         """
         super().__init__()
 
-        container_type = ContainersConfig().get_container_type(container_id)
+        self.containers_config = ContainersConfig()
+
+        container_type = self.containers_config.get_container_type(container_id)
 
         if container_type == None or container_type == "lxc":
             from  libertine.LxcContainer import LibertineLXC
@@ -287,7 +310,7 @@
         Creates the container.
         """
         self.container.architecture = HostInfo().get_host_architecture()
-        self.container.installed_release = ContainersConfig().get_container_distro(self.container_id)
+        self.container.installed_release = self.containers_config.get_container_distro(self.container_id)
 
         return self.container.create_libertine_container(password, multiarch, verbosity)
 
@@ -349,7 +372,7 @@
         :param app_exec_line: the application exec line as passed in by
             ubuntu-app-launch
         """
-        if ContainersConfig().container_exists(self.container.container_id):
+        if self.containers_config.container_exists(self.container.container_id):
             # Update $PATH as necessary
             if '/usr/games' not in os.environ['PATH']:
                 os.environ['PATH'] = os.environ['PATH'] + ":/usr/games"
@@ -390,9 +413,69 @@
         except RuntimeError as e:
             return handle_runtime_error(e)
 
-    def configure_command(self, command, *args):
-        try:
-            with ContainerRunning(self.container):
-                return self.container.configure_command(command, *args)
-        except RuntimeError as e:
-            return handle_runtime_error(e)
+    def configure_multiarch(self, should_enable, verbosity=1):
+        try:
+            with ContainerRunning(self.container):
+                return self.container.configure_multiarch(should_enable, verbosity)
+        except RuntimeError as e:
+            return handle_runtime_error(e)
+
+    def configure_add_archive(self, archive, key, verbosity):
+        try:
+            with ContainerRunning(self.container):
+                return self.container.configure_add_archive(archive, key, verbosity)
+        except RuntimeError as e:
+            return handle_runtime_error(e)
+
+    def configure_remove_archive(self, archive, verbosity):
+        try:
+            with ContainerRunning(self.container):
+                return self.container.configure_remove_archive(archive, verbosity)
+        except RuntimeError as e:
+            return handle_runtime_error(e)
+
+
+class LibertineApplication(object):
+    """
+    Launches a libertine container with a session bridge for sockets such as dbus
+
+    :param container_id: The container id.
+    "param app_exec_line: The exec line used to start the app in the container.
+    """
+    def __init__(self, container_id, app_exec_line):
+        self.container_id   = container_id
+        self.app_exec_line  = app_exec_line
+        self.session_bridge = None
+
+    """
+    Launches the libertine session bridge. This creates a proxy socket to read to and from
+    for abstract sockets such as dbus.
+
+    :param session_socket_paths: A list of socket paths the session will create.
+    """
+    def launch_session_bridge(self, session_socket_paths):
+        session_bridge_arguments = ''
+        for paths in session_socket_paths:
+            session_bridge_arguments += paths + ' '
+
+        libertine_session_bridge_cmd = "libertine-session-bridge " + session_bridge_arguments
+
+        args = shlex.split(libertine_session_bridge_cmd)
+        self.session_bridge = psutil.Popen(args)
+
+    """
+    Launches the container from the id and attempts to run the application exec.
+    """
+    def launch_application(self):
+        if not ContainersConfig().container_exists(self.container_id):
+            raise RuntimeError("Container ID %s does not exist." % self.container_id)
+
+        container = LibertineContainer(self.container_id)
+
+        try:
+            container.launch_application(self.app_exec_line)
+        except:
+            raise
+        finally:
+            if self.session_bridge is not None:
+                self.session_bridge.terminate()
 
=== modified file 'python/libertine/LxcContainer.py'
--- python/libertine/LxcContainer.py	2016-06-29 12:54:58 +0000
+++ python/libertine/LxcContainer.py	2016-07-21 17:26:05 +0000
@@ -41,18 +41,11 @@
     return found
 
 
-def setup_host_environment(username, password):
+def setup_host_environment(username):
     lxc_net_entry = "%s veth lxcbr0 10" % str(username)
 
     if not check_lxc_net_entry(lxc_net_entry):
-        passwd = subprocess.Popen(["sudo", "--stdin", "usermod", "--add-subuids", "100000-165536",
-                                   "--add-subgids", "100000-165536", str(username)],
-                                  stdin=subprocess.PIPE, stdout=subprocess.DEVNULL,
-                                  stderr=subprocess.STDOUT)
-        passwd.communicate((password + '\n').encode('UTF-8'))
-
-        add_user_cmd = "echo %s | sudo tee -a /etc/lxc/lxc-usernet > /dev/null" % lxc_net_entry
-        subprocess.Popen(add_user_cmd, shell=True)
+        subprocess.Popen(["sudo", "libertine-lxc-setup", str(username)]).wait()
 
 
 def get_lxc_default_config_path():
@@ -151,7 +144,7 @@
         user_id = os.getuid()
         group_id = os.getgid()
 
-        setup_host_environment(username, password)
+        setup_host_environment(username)
 
         # Generate the default lxc default config, if it doesn't exist
         config_path = get_lxc_default_config_path()
 
=== modified file 'python/libertine/__init__.py'
--- python/libertine/__init__.py	2015-11-23 20:04:30 +0000
+++ python/libertine/__init__.py	2016-07-21 17:26:05 +0000
@@ -22,9 +22,10 @@
 
 __all__ = [
           # from Libertine
-          'LibertineContainer', 'utils'
+          'LibertineContainer', 'utils', 'LibertineApplication'
           ]
 
 __docformat__ = "restructuredtext en"
 
 from libertine.Libertine import LibertineContainer
+from libertine.Libertine import LibertineApplication
 
=== modified file 'tests/unit/CMakeLists.txt'
--- tests/unit/CMakeLists.txt	2016-06-27 16:41:52 +0000
+++ tests/unit/CMakeLists.txt	2016-07-21 17:26:05 +0000
@@ -44,14 +44,10 @@
                      ENVIRONMENT
                      "GI_TYPELIB_PATH=${CMAKE_BINARY_DIR}/liblibertine;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/liblibertine:${LD_LIBRARY_PATH};CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR};PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_SOURCE_DIR}/python;CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}")
 
-set(DISABLED 1)
-
-if (NOT DISABLED)
-    add_test(test_libertine_launch
-      "/usr/bin/python3" "-m" "testtools.run" "libertine_launch_tests"
-    )
-    set_tests_properties(test_libertine_launch
-                         PROPERTIES
-                         ENVIRONMENT
-                         "GI_TYPELIB_PATH=${CMAKE_BINARY_DIR}/liblibertine;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/liblibertine:${LD_LIBRARY_PATH};CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR};PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_SOURCE_DIR}/python;CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}")
-endif()
+add_test(test_libertine_launch
+  "/usr/bin/python3" "-m" "testtools.run" "libertine_launch_tests"
+)
+set_tests_properties(test_libertine_launch
+                     PROPERTIES
+                     ENVIRONMENT
+                     "GI_TYPELIB_PATH=${CMAKE_BINARY_DIR}/liblibertine;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/liblibertine:${LD_LIBRARY_PATH};CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR};PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_SOURCE_DIR}/python;CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}")
 
=== modified file 'tests/unit/libertine_launch_tests.py'
--- tests/unit/libertine_launch_tests.py	2015-12-18 20:31:46 +0000
+++ tests/unit/libertine_launch_tests.py	2016-07-21 17:26:05 +0000
@@ -18,34 +18,32 @@
 import subprocess
 import tempfile
 
+from libertine import LibertineApplication
+
 from testtools import TestCase
 from testtools.matchers import Equals, NotEquals
 
 class TestLibertineLaunch(TestCase):
-
     def setUp(self):
         super(TestLibertineLaunch, self).setUp()
         self.cmake_source_dir = os.environ['CMAKE_SOURCE_DIR']
         self.cmake_binary_dir = os.environ['CMAKE_BINARY_DIR']
 
-        # Set the paths to the config file
         container_config_path = os.path.join(self.cmake_binary_dir, 'tests', 'unit', 'libertine-config')
-        container_config_file = os.path.join(container_config_path, 'libertine', 'ContainersConfig.json')
 
         # Set necessary enviroment variables
         os.environ['XDG_DATA_HOME'] = container_config_path
         os.environ['XDG_RUNTIME_DIR'] = tempfile.mkdtemp()
-        os.environ['DISPLAY'] = ':0'
         os.environ['PATH'] = (self.cmake_source_dir + '/tests/mocks:' +
                               self.cmake_source_dir + '/tools:' + os.environ['PATH'])
 
         self.addCleanup(self.cleanup)
 
-        # Make a mock container
+        # Lets figure out how to really mock this....
         cli_cmd = self.cmake_source_dir + '/tools/libertine-container-manager create -i test -n Test -t mock'
         args = shlex.split(cli_cmd)
         subprocess.Popen(args).wait()
-    
+
     def cleanup(self):
         shutil.rmtree(os.environ['XDG_RUNTIME_DIR'])
 
@@ -53,46 +51,26 @@
         '''
         Base line test to ensure launching an app in an existing container works.
         '''
-        cli_cmd = self.cmake_source_dir + '/tools/libertine-launch test true'
-        args = shlex.split(cli_cmd)
-        p = subprocess.Popen(args)
-        p.wait()
-
-        self.assertThat(p.returncode, Equals(0))
+        la = LibertineApplication('test', 'true')
+        la.launch_application()
 
     def test_launch_app_nonexistent_container(self):
         '''
         Test to make sure that things gracefully handle a non-existing container.
         '''
-        cli_cmd = self.cmake_source_dir + '/tools/libertine-launch test1 true'
-        args = shlex.split(cli_cmd)
-        p = subprocess.Popen(args)
-        p.wait()
-
-        # Should fail due to nonexistent container
-        self.assertThat(p.returncode, Equals(1))
+        la = LibertineApplication('test1', 'true')
+        self.assertRaises(RuntimeError, la.launch_application)
 
     def test_launch_good_app(self):
         '''
         Test to make sure that launching an app actually works.
         '''
-        cli_cmd = self.cmake_source_dir + '/tools/libertine-launch test mock_app'
-        args = shlex.split(cli_cmd)
-        p = subprocess.Popen(args)
-        p.wait()
-
-        self.assertThat(p.returncode, Equals(0))
-        self.assertThat(os.path.exists(os.path.join(os.environ['XDG_RUNTIME_DIR'], 'mock')), Equals(True))
-
-        os.remove(os.path.join(os.path.join(os.environ['XDG_RUNTIME_DIR'], 'mock')))
+        la = LibertineApplication('test', 'mock_app')
+        la.launch_application()
 
     def test_launch_bad_app(self):
         '''
         Test to make sure launching an app that doesn't exist doesn't break things
         '''
-        cli_cmd = self.cmake_source_dir + '/tools/libertine-launch test foo'
-        args = shlex.split(cli_cmd)
-        p = subprocess.Popen(args)
-        p.wait()
-
-        self.assertThat(p.returncode, Equals(1))
+        la = LibertineApplication('test', 'foo')
+        self.assertRaises(FileNotFoundError, la.launch_application)
 
=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2016-06-07 19:49:27 +0000
+++ tools/CMakeLists.txt	2016-07-21 17:26:05 +0000
@@ -1,4 +1,4 @@
-install(PROGRAMS libertine-container-manager libertine-launch libertine-session-bridge libertine-lxc-manager libertine-xmir
+install(PROGRAMS libertine-container-manager libertine-launch libertine-session-bridge libertine-lxc-manager libertine-xmir libertine-lxc-setup
         DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES libertine-launch.1 libertine-container-manager.1 libertine-session-bridge.1 libertine-lxc-manager.1 libertine-xmir.1
         DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
 
=== modified file 'tools/libertine-container-manager'
--- tools/libertine-container-manager	2016-07-06 18:39:53 +0000
+++ tools/libertine-container-manager	2016-07-21 17:26:05 +0000
@@ -74,7 +74,7 @@
             if args.password:
                 password = args.password
             elif sys.stdin.isatty():
-                print("Your user password is required for creating a Libertine container.")
+                print("Enter password for your user in the Libertine container or leave blank for no password:")
                 password = getpass.getpass()
             else:
                 password = sys.stdin.readline().rstrip()
@@ -206,10 +206,14 @@
         if not container.exec_command(args.command):
             sys.exit(1)
 
-    def delete_archive_by_name(self, container_id, archive_name):
+    def delete_archive_by_name(self, container_id, archive_name, verbosity=1):
         self.containers_config.update_archive_install_status(container_id, archive_name, 'removing')
-        if LibertineContainer(container_id).configure_command('delete-archive', archive_name) is not 0:
-            return False
+        if self.containers_config.get_archive_install_status(container_id, archive_name) == 'installed':
+            self.containers_config.update_archive_install_status(container_id, archive_name, 'removing')
+            if LibertineContainer(container_id).configure_remove_archive("\"" + archive_name + "\"", verbosity) is not 0:
+                self.containers_config.update_archive_install_status(container_id, archive_name, 'installed')
+                return False
+
         self.containers_config.delete_container_archive(container_id, archive_name)
         return True
 
@@ -228,31 +232,41 @@
                 print("i386 multiarch support is already %s" % multiarch)
                 sys.exit(1)
 
-            if container.configure_command('multiarch', args.multiarch) is not 0:
+            if container.configure_multiarch(args.multiarch, args.verbosity) is not 0:
                 sys.exit(1)
 
             self.containers_config.update_container_multiarch_support(container_id, multiarch)
 
-        elif args.add_archive:
-            if self.containers_config.archive_exists(container_id, args.add_archive):
-                print("%s already added in container." % args.add_archive)
-                sys.exit(1)
-
-            self.containers_config.add_container_archive(container_id, args.add_archive)
-            self.containers_config.update_archive_install_status(container_id, args.add_archive, 'installing')
-            if container.configure_command('add-archive', args.add_archive) is not 0:
-                self.containers_config.delete_container_archive(container_id, args.add_archive)
-                sys.exit(1)
-
-            self.containers_config.update_archive_install_status(container_id, args.add_archive, 'installed')
-
-        elif args.delete_archive:
-            if not self.containers_config.archive_exists(container_id, args.delete_archive):
-                print("%s is not added in container." % args.delete_archive)
-                sys.exit(1)
-
-            if not self.delete_archive_by_name(container_id, args.delete_archive):
-                sys.exit(1)
+        elif args.archive is not None:
+            archive_name = args.archive_name.strip("\'\"")
+            archive_name_esc = "\"" + archive_name + "\""
+
+            if args.archive == 'add':
+                if self.containers_config.archive_exists(container_id, archive_name):
+                    print("%s already added in container." % archive_name)
+                    sys.exit(1)
+
+                self.containers_config.add_container_archive(container_id, archive_name)
+                self.containers_config.update_archive_install_status(container_id, archive_name, 'installing')
+                if container.configure_add_archive(archive_name_esc, args.public_key_file, args.verbosity) is not 0:
+                    self.containers_config.delete_container_archive(container_id, archive_name)
+                    sys.exit(1)
+
+                self.containers_config.update_archive_install_status(container_id, archive_name, 'installed')
+
+            elif args.archive == 'remove':
+                if not self.containers_config.archive_exists(container_id, archive_name):
+                    print("%s is not added in container." % archive_name)
+                    sys.exit(1)
+
+                if not self.delete_archive_by_name(container_id, archive_name):
+                    print("%s was not properly deleted." % archive_name)
+                    sys.exit(1)
+
+        else:
+            print("Configure called with no subcommand. See configure --help for usage.")
+            sys.exit(1)
+
 
     def merge(self, args):
         self.containers_config.merge_container_config_files(args.file)
@@ -435,22 +449,31 @@
     parser_configure.add_argument(
         '-i', '--id',
         help=("Container identifier.  Default container is used if omitted."))
-    parser_configure.add_argument(
-        '-m', '--multiarch',
-        choices=['enable', 'disable'],
-        help=("Enables or disables i386 multiarch support for amd64 Libertine "
-              "containers.   This option has no effect when the Libertine "
-              "container is i386."))
-    parser_configure.add_argument(
-        '-a', '--add-archive',
-        metavar='Archive name',
-        help=("Adds an archive (PPA) in the specified Libertine container.  Needs to be "
-              "in the form of \"ppa:user/ppa-name\"."))
-    parser_configure.add_argument(
-        '-d', '--delete-archive',
-        metavar='Archive name',
-        help=("Deletes an existing archive (PPA) in the specified Libertine container.  "
-              "Needs to be in the form of \"ppa:user/ppa-name\"."))
+    multiarch_group = parser_configure.add_argument_group("Multiarch support",
+                      "Enable or disable multiarch support for a container.")
+    multiarch_group.add_argument(
+         '-m', '--multiarch',
+         choices=['enable', 'disable'],
+         help=("Enables or disables i386 multiarch support for amd64 Libertine "
+               "containers. This option has no effect when the Libertine "
+               "container is i386."))
+
+    archive_group = parser_configure.add_argument_group("Additional archive support",
+                    "Add or delete an additional archive (PPA).")
+    archive_group.add_argument(
+        '-a', '--archive',
+        choices=['add', 'remove'],
+        help=("Adds or removes an archive (PPA) in the specified Libertine container."))
+    archive_group.add_argument(
+      '-n', '--archive-name',
+      metavar='Archive name',
+      help=("Archive name to be added or removed."))
+    archive_group.add_argument(
+        '-k', '--public-key-file',
+        metavar='Public key file',
+        help=("File containing the key used to sign the given archive. "
+              "Useful for third-party or private archives."))
+
     parser_configure.set_defaults(func=container_manager.configure)
 
     # Handle merging another ContainersConfig.json file into the main ContainersConfig.json file
 
=== modified file 'tools/libertine-container-manager.1'
--- tools/libertine-container-manager.1	2016-06-07 14:00:34 +0000
+++ tools/libertine-container-manager.1	2016-07-21 17:26:05 +0000
@@ -265,14 +265,19 @@
 Enable i386 support.
 .RE
 .IP
-.BR \-a " ARCHIVE_NAME, " \-\-add-archive " ARCHIVE_NAME" ""
-.RS 14
-Adds an archive to the specified container. Format like "ppa:user/ppa-name".
-.RE
-.IP
-.BR \-d " ARCHIVE_NAME, " \-\-delete-archive " ARCHIVE_NAME" ""
-.RS 14
-Deletes an archive to the specified container. Format like "ppa:user/ppa-name".
+.BR \-a " {add,remove}, " \-\-archive "{add,remove}" ""
+.RS 14
+Adds or removes an archive in the specified container.
+.RE
+.IP
+.BR \-n " ARCHIVE_NAME, " \-\-archive-name " ARCHIVE_NAME" ""
+.RS 14
+Archive to be added or removed. Examples: 'deb http://myserver/path/to/repo stable myrepo', ppa:user/repository, multiverse
+.RE
+.IP
+.BR \-k " PUBLIC_KEY_FILE, " \-\-public-key-file " PUBLIC_KEY_FILE" ""
+.RS 14
+File containing public key used to sign new archive.
 .RE
 .TP
 
 
=== modified file 'tools/libertine-launch'
--- tools/libertine-launch	2016-06-28 20:16:55 +0000
+++ tools/libertine-launch	2016-07-21 17:26:05 +0000
@@ -21,11 +21,9 @@
 import random
 import string
 import libertine.utils
-import psutil
 import shlex
 import time
-
-from libertine import LibertineContainer
+from libertine import LibertineApplication
 
 
 def get_session_socket_path(session_socket_name):
@@ -60,13 +58,6 @@
     set_env_socket_path(socket_path, 'MALIIT_SERVER_ADDRESS')
 
 
-def launch_libertine_session_bridge(session_socket_path):
-    libertine_session_bridge_cmd = "libertine-session-bridge " + session_socket_path
-
-    args = shlex.split(libertine_session_bridge_cmd)
-    return psutil.Popen(args)
-
-
 def detect_session_bridge_socket(session_socket_path):
     retries = 0
 
@@ -87,6 +78,8 @@
                             help='exec line')
     args = arg_parser.parse_args()
 
+    la = LibertineApplication(args.container_id, args.app_exec_line)
+
     # remove problematic environment variables
     for e in ['QT_QPA_PLATFORM', 'LD_LIBRARY_PATH', 'FAKECHROOT_BASE', 'FAKECHROOT_CMD_SUBST']:
         if e in os.environ:
@@ -94,9 +87,8 @@
 
     dbus_socket_path = get_dbus_session_socket_path()
     maliit_socket_path = get_maliit_session_socket_path()
-    session_bridge_arguments = dbus_socket_path + ' ' + maliit_socket_path
 
-    session_bridge = launch_libertine_session_bridge(session_bridge_arguments)
+    la.launch_session_bridge([dbus_socket_path, maliit_socket_path])
 
     set_dbus_env_socket_path(dbus_socket_path)
     set_maliit_env_socket_path(maliit_socket_path)
@@ -104,11 +96,4 @@
     # should detect the maliit socket, but dont know if its around or not here.
     detect_session_bridge_socket(dbus_socket_path)
 
-    container = LibertineContainer(args.container_id)
-
-    try:
-        container.launch_application(args.app_exec_line)
-    except:
-        raise
-    finally:
-        session_bridge.terminate()
+    la.launch_application()
 
=== added file 'tools/libertine-lxc-setup'
--- tools/libertine-lxc-setup	1970-01-01 00:00:00 +0000
+++ tools/libertine-lxc-setup	2016-07-21 17:26:05 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+USERNAME=$1
+
+LXC_USERNET_ENTRY="$USERNAME veth lxcbr0 10"
+
+usermod --add-subuids 100000-165536 --add-subgids 100000-165536 $USERNAME
+
+echo $LXC_USERNET_ENTRY | tee -a /etc/lxc/lxc-usernet > /dev/null
 
=== modified file 'tools/libertine-session-bridge'
--- tools/libertine-session-bridge	2016-06-27 15:59:41 +0000
+++ tools/libertine-session-bridge	2016-07-21 17:26:05 +0000
@@ -123,7 +123,12 @@
                 accept_new_connection(host_session_socket_path_map[sock], sock)
 
             else:
-                data = sock.recv(4096)
+                try:
+                    data = sock.recv(4096)
+                except:
+                    close_connections(sock)
+                    continue
+
                 if len(data) == 0:
                     close_connections(sock)
                     continue
 
=== modified file 'tools/update-puritine-containers'
--- tools/update-puritine-containers	2016-06-10 20:34:33 +0000
+++ tools/update-puritine-containers	2016-07-21 17:26:05 +0000
@@ -23,10 +23,20 @@
 import shutil
 import subprocess
 
+from gi.repository import GLib, Gio
+
 puritine_hook_dir = os.path.join(os.environ['HOME'], '.cache', 'libertine', 'puritine')
 puritine_symlink_farm_file = os.path.join(puritine_hook_dir, 'PuritineSymlinkFarm.json')
 puritine_click_config_file = os.path.join('libertine-config', 'libertine', 'ContainersConfig.json')
 
+def symlink_farm_entries_count():
+    if (puritine_symlink_farm_list and
+        puritine_symlink_farm_list['customContainers']):
+        return len(puritine_symlink_farm_list['customContainers'])
+
+    return 0
+
+
 def puritine_symlink_exists(symlink):
     for file in os.listdir(puritine_hook_dir):
         if file == symlink:
@@ -117,21 +127,59 @@
     return puritine_symlink_farm_list
 
 
-puritine_symlink_farm_list = {}
-
-if not os.path.exists(puritine_hook_dir):
-    os.makedirs(puritine_hook_dir)
-
-if (os.path.exists(puritine_symlink_farm_file) and
-    os.path.getsize(puritine_symlink_farm_file) != 0):
-    with open(puritine_symlink_farm_file, 'r') as fd:
-        puritine_symlink_farm_list = json.load(fd)
-
-puritine_symlink_farm_list = find_new_or_updated_puritine_symlinks(puritine_symlink_farm_list)
-
-if puritine_symlink_farm_list:
-    puritine_symlink_farm_list = find_removed_puritine_symlinks(puritine_symlink_farm_list)
-
-with open(puritine_symlink_farm_file, 'w') as fd:
-    json.dump(puritine_symlink_farm_list, fd, sort_keys=True, indent=4)
-    fd.write('\n')
+def favorite_libertine_scope():
+    libertine_scope_value = 'scope://libertine-scope.ubuntu_libertine-scope'
+    click_scope_value = 'scope://clickscope'
+    schema = 'com.canonical.Unity.Dash'
+    schema_key = 'favorite-scopes'
+
+    settings = Gio.Settings.new(schema)
+
+    favorites = settings.get_value(schema_key)
+
+    array = favorites.dup_strv()
+
+    if not libertine_scope_value in array:
+        array.insert(array.index(click_scope_value) + 1, libertine_scope_value)
+        new_favorites = GLib.Variant.new_strv(array)
+        settings.set_value(schema_key, new_favorites)
+        del new_favorites
+
+    del array
+    del favorites
+    del settings
+
+
+if __name__ == '__main__':
+    puritine_symlink_farm_list = {}
+
+    with open(os.path.join('/', 'run', 'user', str(os.getuid()), 'dbus-session'), 'r') as fd:
+        dbus_session_str = fd.read()
+
+    os.environ['DBUS_SESSION_BUS_ADDRESS'] = dbus_session_str.partition('DBUS_SESSION_BUS_ADDRESS=')[2].rstrip('\n')
+
+    if not os.path.exists(puritine_hook_dir):
+        os.makedirs(puritine_hook_dir)
+
+    if (os.path.exists(puritine_symlink_farm_file) and
+        os.path.getsize(puritine_symlink_farm_file) != 0):
+        with open(puritine_symlink_farm_file, 'r') as fd:
+            puritine_symlink_farm_list = json.load(fd)
+
+    count_at_start = symlink_farm_entries_count()
+
+    puritine_symlink_farm_list = find_new_or_updated_puritine_symlinks(puritine_symlink_farm_list)
+
+    if puritine_symlink_farm_list:
+        puritine_symlink_farm_list = find_removed_puritine_symlinks(puritine_symlink_farm_list)
+
+    count_at_finish = symlink_farm_entries_count()
+
+    with open(puritine_symlink_farm_file, 'w') as fd:
+        json.dump(puritine_symlink_farm_list, fd, sort_keys=True, indent=4)
+        fd.write('\n')
+
+    if count_at_start == 0 and count_at_finish > 0:
+        favorite_libertine_scope()
+
+    libertine.utils.refresh_libertine_scope()