diff -pruN 4:4.11.3-1/debian/changelog 4:4.14.2-1/debian/changelog
--- 4:4.11.3-1/debian/changelog	2013-11-10 10:42:48.000000000 +0000
+++ 4:4.14.2-1/debian/changelog	2014-10-20 15:13:05.000000000 +0000
@@ -1,3 +1,59 @@
+kwallet (4:4.14.2-1) unstable; urgency=medium
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Remove myself from Uploaders.
+
+  [ Maximiliano Curia ]
+  * New upstream release (4.14.2).
+
+ -- Maximiliano Curia <maxy@debian.org>  Mon, 20 Oct 2014 17:13:05 +0200
+
+kwallet (4:4.14.1-1) unstable; urgency=medium
+
+  * New upstream release (4.14.1).
+
+ -- Maximiliano Curia <maxy@debian.org>  Wed, 17 Sep 2014 09:44:28 +0200
+
+kwallet (4:4.14.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy@debian.org>  Wed, 20 Aug 2014 05:31:59 +0200
+
+kwallet (4:4.13.3-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy@debian.org>  Tue, 22 Jul 2014 10:29:08 +0200
+
+kwallet (4:4.13.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy@debian.org>  Fri, 23 May 2014 17:30:52 +0200
+
+kwallet (4:4.12.4-1) unstable; urgency=medium
+
+  * Update copyright Upstream-Name.
+  * New upstream release.
+  * Update watch file.
+
+ -- Maximiliano Curia <maxy@debian.org>  Mon, 28 Apr 2014 12:24:24 +0200
+
+kwallet (4:4.12.3-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy@debian.org>  Tue, 04 Mar 2014 00:05:41 +0100
+
+kwallet (4:4.12.2-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Update install files.
+  * Bump kde-sc-dev-latest build dependency.
+
+ -- Maximiliano Curia <maxy@debian.org>  Mon, 10 Feb 2014 11:31:35 +0100
+
 kwallet (4:4.11.3-1) unstable; urgency=low
 
   * New upstream release.
diff -pruN 4:4.11.3-1/debian/control 4:4.14.2-1/debian/control
--- 4:4.11.3-1/debian/control	2013-11-10 10:42:48.000000000 +0000
+++ 4:4.14.2-1/debian/control	2014-10-20 15:13:05.000000000 +0000
@@ -2,16 +2,18 @@ Source: kwallet
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-Uploaders: Fathi Boudra <fabo@debian.org>, Sune Vuorela <sune@debian.org>,
+Uploaders: Fathi Boudra <fabo@debian.org>,
+           Sune Vuorela <sune@debian.org>,
            Modestas Vainius <modax@debian.org>,
            George Kiagiadakis <kiagiadakis.george@gmail.com>,
            Eshat Cakar <info@eshat.de>,
-           Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>,
            Maximiliano Curia <maxy@debian.org>
-Build-Depends: kde-sc-dev-latest (>= 4:4.11),
- cmake, debhelper (>= 9), pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.11)
-Standards-Version: 3.9.4
+Build-Depends: cmake,
+               debhelper (>= 9),
+               kde-sc-dev-latest (>= 4:4.12),
+               kdelibs5-dev (>= 4:4.11),
+               pkg-kde-tools (>= 0.12)
+Standards-Version: 3.9.5
 Homepage: http://www.kde.org
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kwallet.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kwallet.git
@@ -19,7 +21,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-kd
 Package: kwalletmanager
 Architecture: any
 Section: utils
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: secure password wallet manager
  The KDE Wallet system provides a secure way to store passwords and other
  secret information, allowing the user to remember only a single KDE Wallet
diff -pruN 4:4.11.3-1/debian/copyright 4:4.14.2-1/debian/copyright
--- 4:4.11.3-1/debian/copyright	2013-11-10 10:42:48.000000000 +0000
+++ 4:4.14.2-1/debian/copyright	2014-10-20 15:13:05.000000000 +0000
@@ -1,5 +1,5 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: kwallet
+Upstream-Name: kwalletmanager
 Source: http://www.kde.org
 
 Files: kbetterthankdialogbase.*
@@ -69,4 +69,4 @@ License: GFDL-NIV-1.2+
  Free Documentation License".
  .
  On Debian systems, the complete text of the GNU Free Documentation License
- can be found in "/usr/share/common-licenses/GFDL-1.2".
\ No newline at end of file
+ can be found in "/usr/share/common-licenses/GFDL-1.2".
diff -pruN 4:4.11.3-1/debian/kwalletmanager.install 4:4.14.2-1/debian/kwalletmanager.install
--- 4:4.11.3-1/debian/kwalletmanager.install	2013-11-10 10:42:48.000000000 +0000
+++ 4:4.14.2-1/debian/kwalletmanager.install	2014-10-20 15:13:05.000000000 +0000
@@ -1,7 +1,10 @@
+etc/dbus-1/system.d/org.kde.kcontrol.kcmkwallet.conf
 usr/bin/kwalletmanager
 usr/lib/kde4/kcm_kwallet.so
+usr/lib/kde4/libexec/kcm_kwallet_helper
 usr/share/applications/kde4/kwalletmanager-kwalletd.desktop
 usr/share/applications/kde4/kwalletmanager.desktop
+usr/share/dbus-1/system-services/org.kde.kcontrol.kcmkwallet.service
 usr/share/doc/kde/HTML/*/kwallet/*
 usr/share/icons/hicolor/128x128/apps/kwalletmanager.png
 usr/share/icons/hicolor/128x128/apps/kwalletmanager2.png
@@ -19,3 +22,4 @@ usr/share/kde4/apps/kwalletmanager/icons
 usr/share/kde4/apps/kwalletmanager/kwalletmanager.rc
 usr/share/kde4/services/kwalletconfig.desktop
 usr/share/kde4/services/kwalletmanager_show.desktop
+usr/share/polkit-1/actions/org.kde.kcontrol.kcmkwallet.policy
diff -pruN 4:4.11.3-1/debian/watch 4:4.14.2-1/debian/watch
--- 4:4.11.3-1/debian/watch	2013-11-10 10:42:48.000000000 +0000
+++ 4:4.14.2-1/debian/watch	2014-10-20 15:13:05.000000000 +0000
@@ -1,2 +1,2 @@
 version=3
-ftp://ftp.kde.org/pub/kde/stable/([\d\.]*)/src/kwallet-([\d\.]*).tar.xz
+http://download.kde.org/stable/([\d.]+)/src/kwalletmanager-([\d.]+).tar.xz
Binary files 4:4.11.3-1/doc/error-nokey.png and 4:4.14.2-1/doc/error-nokey.png differ
diff -pruN 4:4.11.3-1/doc/index.docbook 4:4.14.2-1/doc/index.docbook
--- 4:4.11.3-1/doc/index.docbook	2013-08-28 17:08:58.083862123 +0000
+++ 4:4.14.2-1/doc/index.docbook	2014-10-09 07:07:50.000000000 +0000
@@ -29,8 +29,8 @@
 
 <legalnotice>&FDLNotice;</legalnotice>
 
-<date>2013-06-06</date>
-<releaseinfo>1.10 (&kde; 4.11)</releaseinfo>
+<date>2013-11-19</date>
+<releaseinfo>2.0 (&kde; 4.12)</releaseinfo>
 
 <abstract>
 <para>
@@ -54,22 +54,129 @@ passwords.</para>
 
 <para>Computer users have a very large amount of data to manage, some of
 which is sensitive.  In particular, you will typically have many passwords
-to manage.  Remembering them is difficult, writing them down on paper or in
-a text file is insecure, and using tools such at PGP is tedious and
-inconvenient.</para>
+to manage.  Remembering them is difficult and writing them down on paper or in
+a text file is insecure.</para>
 
+<para>&kwallet; provides a secure way to store passwords and other secret information, 
+allowing the user to remember only a single password instead of numerous different passwords and credentials.
+</para>
+
+<sect1 id="kwallet-create">
+
+<title>Create a Wallet</title>
+
+<para>There are three ways to create a new wallet:</para>
+
+<itemizedlist>
+<listitem><para>Use the menu item <menuchoice><guimenu>File</guimenu><guimenuitem>New 
+Wallet</guimenuitem></menuchoice> in the &kwalletmanager;</para></listitem>
+
+<listitem><para>Use the <guibutton>New</guibutton> button in the &systemsettings; module 
+<guilabel>KDE Wallet</guilabel></para></listitem>
+
+<listitem><para>On the first attempt to store login information in a wallet when you did 
+not create a wallet so far, see section <link linkend="kwallet-using">Using &kwallet;</link>.
+</para></listitem>
+</itemizedlist>
+
+<para>&kwallet; offers two different ways to store your data:</para>
+
+<screenshot>
+<screeninfo>Select encryption</screeninfo>
+<mediaobject>
+<imageobject><imagedata fileref="wallet-encryption-selection.png" format="PNG"/></imageobject>
+<textobject><phrase>Select encryption</phrase></textobject>
+</mediaobject>
+</screenshot>
+
+<variablelist>
+
+<varlistentry>
+<term>Blowfish encryption</term>
+<listitem>
 <para>&kwallet; saves this sensitive data for you in a strongly encrypted
-<footnote><para>
-The data is encrypted with the
+file, accessible by all applications, and protected with a master
+password that you define.</para>
+
+<screenshot>
+<screeninfo>Create a blowfish encrypted wallet</screeninfo>
+<mediaobject>
+<imageobject><imagedata fileref="first-open-request.png" format="PNG"/></imageobject>
+<textobject><phrase>Create a blowfish encrypted wallet</phrase></textobject>
+</mediaobject>
+</screenshot>
+
+<para>The data is encrypted with the
 <ulink url="http://www.schneier.com/blowfish.html">Blowfish symmetric block cipher algorithm</ulink>,
 the algorithm key is derived from the
 <ulink url="http://www.ietf.org/rfc/rfc3174.txt">SHA-1 hash</ulink>
 of the password, with a key length of 156 bits (20 bytes).
 The data into the wallet file is also hashed with SHA-1 and checked
 before the data is deciphered and accessible by the applications.
-</para></footnote>
-file, accessible by all applications, and protected with a master
-password that you define.</para>
+</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>GPG encryption</term>
+<listitem>
+<para>GnuPG offers some very strong encryption algorithms and uses passphrase protected long keys.</para>
+
+<screenshot>
+<screeninfo>No GPG key found</screeninfo>
+<mediaobject>
+<imageobject><imagedata fileref="error-nokey.png" format="PNG"/></imageobject>
+<textobject><phrase>No GPG key found</phrase></textobject>
+</mediaobject>
+</screenshot>
+<para>The screenshots above show the case where an encryption capable GPG key was not 
+found on the system. Please use applications like &kgpg; or &kleopatra; to create a key an try again.</para>
+
+<para>If a GPG key was found you will get the next dialog where you can select a key to use for your new wallet.
+</para>
+<screenshot>
+<screeninfo>Select an encryption key</screeninfo>
+<mediaobject>
+<imageobject><imagedata fileref="key-selection.png" format="PNG"/></imageobject>
+<textobject><phrase>Select an encryption key</phrase></textobject>
+</mediaobject>
+</screenshot>
+
+<para>&kwallet; will now use GPG when storing wallets and when opening them. 
+The passphrase dialog only shows once. Even if the wallet is closed after initial open, 
+subsequent opening will occur silently during the same &kde; session.
+</para>
+
+<para>
+The same &kde; session can handle simultaneously both file formats. &kwallet; will transparently detect 
+the file format and load the correct backend to handle it.</para>
+
+<para>
+To use your sensitive data from your classic wallet with the new backend follow these steps:</para>
+
+<itemizedlist>
+<listitem><para>Create a new GPG based wallet</para></listitem>
+<listitem><para>Launch &kwalletmanager; and select your old wallet then choose <menuchoice><guimenu>File</guimenu>
+<guimenuitem>Export as XML</guimenuitem></menuchoice> to create an &XML; file with your sensitive data.
+</para></listitem>
+<listitem><para>Select the new GPG based wallet then choose <menuchoice><guimenu>File</guimenu>
+<guimenuitem>Import XML</guimenuitem></menuchoice> and select the file you just saved.</para>
+<para>Encrypt the &XML; file to keep a backup.</para>
+</listitem>
+<listitem><para><menuchoice><guimenu>File</guimenu><guimenuitem>Import Wallet</guimenuitem></menuchoice>
+but in that case you have to select the <filename class="extension">.kwl</filename> file corresponding 
+to your old wallet, located in <filename class="directory">$<envar>KDEHOME</envar>/.kde/share/apps/kwallet</filename>.
+</para></listitem>
+<listitem><para>Go to &systemsettings; <menuchoice><guimenu>Account Details</guimenu> <guimenuitem>KDE 
+Wallet</guimenuitem></menuchoice> and select the newly created GPG based wallet from the <guilabel>Select 
+wallet to use as default</guilabel> combobox.
+</para></listitem>
+</itemizedlist>
+
+</listitem>
+</varlistentry>
+
+</variablelist>
 
 <tip>
 <para>&kwallet; supports multiple wallets, so
@@ -82,6 +189,7 @@ the default setting is to store everythi
 <para>A wallet is by default closed, which means that you must supply
 a password to open it. Once the wallet is opened, the contents can
 be accessed.</para>
+</sect1>
 
 <sect1 id="kwallet-using">
 <title>Using &kwallet;</title>
@@ -100,17 +208,9 @@ encrypted wallet:</para>
 
 <para>If you want to store this information, select <guibutton>Store</guibutton> 
 to proceed. In case you did not create a wallet so far, the next dialog asks for 
-the wallet password and creates a wallet named kdewallet.
+the encryption backend and creates a wallet named kdewallet.
 </para>
 
-<screenshot>
-<screeninfo>Create a wallet</screeninfo>
-<mediaobject>
-<imageobject><imagedata fileref="first-open-request.png" format="PNG"/></imageobject>
-<textobject><phrase>Create a wallet</phrase></textobject>
-</mediaobject>
-</screenshot>
-
 <para>Next time you visit the same website again, the application requests to open the wallet.
 Enter the wallet password and click the <guibutton>Open</guibutton> button.</para> 
 
@@ -233,12 +333,12 @@ By default the password and value are hi
 </para></listitem>
 </itemizedlist>
 
-<para>Folders may be added, deleted or renamed via the context menu, and selecting a folder will update
+<para>Folders may be added or deleted via the context menu, and selecting a folder will update
 the folder entry list and the summary display.  Selecting a folder entry
 will update the entry contents pane, and allow you to edit that
 entry.</para>
 
-<para>Entries may also be created or deleted via the context menu for the
+<para>Entries may also be created, renamed or deleted via the context menu for the
 folder contents.</para>
 
 <para>All folders and entries may be dragged and dropped into other wallets
@@ -266,8 +366,8 @@ a wallet. Keep in mind that all secrets
 <guilabel>Passwords</guilabel> in the <guilabel>Folder</guilabel> tree view.
 Select <guimenuitem>New</guimenuitem> and choose a name for the new entry.</para>
 <para>In the folder contents pane select <guilabel>New Entry</guilabel> from 
-the context menu. For passwords click the <guilabel>Show Contents</guilabel> 
-button, enter the new password.
+the context menu of <quote>Form Data</quote> or <quote>Passwords</quote>. 
+For passwords click the <guilabel>Show Contents</guilabel> button, enter the new password.
 For Maps you have to add a <guilabel>Key</guilabel> and a <guilabel>Value</guilabel>.
 Click the <guilabel>Save</guilabel> button to store the new entries in the encrypted
 wallet file.
Binary files 4:4.11.3-1/doc/key-selection.png and 4:4.14.2-1/doc/key-selection.png differ
Binary files 4:4.11.3-1/doc/wallet-encryption-selection.png and 4:4.14.2-1/doc/wallet-encryption-selection.png differ
diff -pruN 4:4.11.3-1/kwalletmanager.desktop 4:4.14.2-1/kwalletmanager.desktop
--- 4:4.11.3-1/kwalletmanager.desktop	2013-11-01 15:51:07.151093176 +0000
+++ 4:4.14.2-1/kwalletmanager.desktop	2014-10-09 07:07:50.000000000 +0000
@@ -42,7 +42,7 @@ Name[pt_BR]=KWalletManager
 Name[ro]=KWalletManager
 Name[ru]=KWalletManager
 Name[sk]=KWalletManager
-Name[sl]=KWalletManager
+Name[sl]=Upravljalnik Listnice za KDE
 Name[sq]=KWalletManager
 Name[sr]=Менаџер К‑новчаника
 Name[sr@ijekavian]=Менаџер К‑новчаника
@@ -65,7 +65,7 @@ GenericName[ca]=Eina de gestió de carte
 GenericName[ca@valencia]=Eina de gestió de carteres
 GenericName[cs]=Nástroj pro správu úschovny
 GenericName[da]=Værktøj til håndtering af tegnebog
-GenericName[de]=Verwaltungswerkzeug für digitale Brieftasche
+GenericName[de]=Passwortverwaltung
 GenericName[el]=Εργαλείο διαχείρισης πορτοφολιού
 GenericName[en_GB]=Wallet Management Tool
 GenericName[es]=Herramienta de gestión de carteras
diff -pruN 4:4.11.3-1/kwalletmanager-kwalletd.desktop 4:4.14.2-1/kwalletmanager-kwalletd.desktop
--- 4:4.11.3-1/kwalletmanager-kwalletd.desktop	2013-11-01 15:51:07.151093176 +0000
+++ 4:4.14.2-1/kwalletmanager-kwalletd.desktop	2014-10-09 07:07:50.000000000 +0000
@@ -10,13 +10,13 @@ Name[ca@valencia]=Eina de gestió de car
 Name[cs]=Nástroj pro správu úschovny
 Name[cy]=Erfyn Rheoli Waled
 Name[da]=Håndteringsværktøj for tegnebog
-Name[de]=Verwaltung für digitale Brieftasche
+Name[de]=Passwortverwaltung
 Name[el]=Εργαλείο διαχείρισης πορτοφολιού
 Name[en_GB]=Wallet Management Tool
 Name[eo]=Paperuja administrilo
 Name[es]=Herramienta de gestión de cartera
 Name[et]=Turvalaeka haldur
-Name[eu]=Kartera Kudeatzeko Tresna
+Name[eu]=Zorroa kudeatzeko tresna
 Name[fa]=ابزار مدیریت  Wallet
 Name[fi]=Lompakonhallinta
 Name[fr]=Outil de gestion de portefeuilles
@@ -44,7 +44,7 @@ Name[ne]=वालेट व्यवस
 Name[nl]=Portefeuillebeheer
 Name[nn]=Wallet-administrasjonsverktøy
 Name[pa]=ਵਾਲਿਟ ਪਰਬੰਧਨ ਟੂਲ
-Name[pl]=Narzędzie do zarządzania Portfelem
+Name[pl]=Narzędzie do zarządzania portfelem
 Name[pt]=Ferramenta de Gestão da Carteira
 Name[pt_BR]=Ferramenta de gerenciamento de carteiras
 Name[ro]=Administrare portofel
diff -pruN 4:4.11.3-1/src/konfigurator/CMakeLists.txt 4:4.14.2-1/src/konfigurator/CMakeLists.txt
--- 4:4.11.3-1/src/konfigurator/CMakeLists.txt	2013-08-28 17:08:58.084862116 +0000
+++ 4:4.14.2-1/src/konfigurator/CMakeLists.txt	2014-10-09 07:07:50.000000000 +0000
@@ -15,6 +15,16 @@ target_link_libraries(kcm_kwallet ${KDE4
 
 install(TARGETS kcm_kwallet  DESTINATION ${PLUGIN_INSTALL_DIR})
 
+########### kauth helper ################
+set(kcm_kwallet_helper_SRCS savehelper.cpp)
+
+kde4_add_executable(kcm_kwallet_helper ${kcm_kwallet_helper_SRCS})
+target_link_libraries(kcm_kwallet_helper ${KDE4_KDECORE_LIBS})
+
+install(TARGETS kcm_kwallet_helper DESTINATION ${LIBEXEC_INSTALL_DIR})
+
+kde4_install_auth_helper_files(kcm_kwallet_helper org.kde.kcontrol.kcmkwallet root)
+kde4_install_auth_actions(org.kde.kcontrol.kcmkwallet kwallet.actions)
 
 ########### install files ###############
 
diff -pruN 4:4.11.3-1/src/konfigurator/konfigurator.cpp 4:4.14.2-1/src/konfigurator/konfigurator.cpp
--- 4:4.11.3-1/src/konfigurator/konfigurator.cpp	2013-08-28 17:08:58.085862109 +0000
+++ 4:4.14.2-1/src/konfigurator/konfigurator.cpp	2014-10-09 07:07:50.000000000 +0000
@@ -28,12 +28,16 @@
 #include <kinputdialog.h>
 #include <kmenu.h>
 #include <kwallet.h>
+#include <kauthaction.h>
+#include <kdebug.h>
 
 #include <QCheckBox>
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <ktoolinvocation.h>
 #include <kconfiggroup.h>
+#include <kmessagebox.h>
+#include <kstandarddirs.h>
 #define KWALLETMANAGERINTERFACE "org.kde.KWallet"
 
 K_PLUGIN_FACTORY(KWalletFactory, registerPlugin<KWalletConfig>();)
@@ -52,6 +56,8 @@ KWalletConfig::KWalletConfig(QWidget *pa
 		about->addAuthor(ki18n("George Staikos"), KLocalizedString(), "staikos@kde.org");
 	setAboutData( about );
 
+    setNeedsAuthorization(true);
+
 	QVBoxLayout *vbox = new QVBoxLayout(this);
 	vbox->setSpacing(KDialog::spacingHint());
 	vbox->setMargin(0);
@@ -182,7 +188,7 @@ void KWalletConfig::load() {
 	KConfigGroup config(_cfg, "Wallet");
 	_wcw->_enabled->setChecked(config.readEntry("Enabled", true));
 	_wcw->_openPrompt->setChecked(config.readEntry("Prompt on Open", false));
-	_wcw->_launchManager->setChecked(config.readEntry("Launch Manager", true));
+	_wcw->_launchManager->setChecked(config.readEntry("Launch Manager", false));
 	_wcw->_autocloseManager->setChecked(! config.readEntry("Leave Manager Open", false));
 	_wcw->_screensaverLock->setChecked(config.readEntry("Close on Screensaver", false));
 	_wcw->_autoclose->setChecked(!config.readEntry("Leave Open", false));
@@ -215,10 +221,24 @@ void KWalletConfig::load() {
 	QStringList denykeys = ad.entryMap().keys();
 	const QStringList keys = aa.entryMap().keys();
 	for (QStringList::const_iterator i = keys.begin(); i != keys.end(); ++i) {
+        QString walletName = *i;
+        // perform cleanup in the kwalletrc file, by removing entries that correspond to non-existent
+        // (previously deleted, for example) wallets
+        QString path = KGlobal::dirs()->locateLocal("data", QString("kwallet/%1.kwl").arg(walletName));
+        if (!QFile::exists(path)) {
+            // if the wallet no longer exists, delete the entries from the configuration file and skip to next entry
+            KConfigGroup cfgAllow = KSharedConfig::openConfig("kwalletrc")->group("Auto Allow");
+            cfgAllow.deleteEntry(walletName);
+
+            KConfigGroup cfgDeny = KSharedConfig::openConfig("kwalletrc")->group("Auto Deny");
+            cfgDeny.deleteEntry(walletName);
+            continue;
+        }
+
 		const QStringList apps = aa.readEntry(*i,QStringList());
 		const QStringList denyapps = ad.readEntry(*i, QStringList());
-		denykeys.removeAll(*i);
-		QTreeWidgetItem *twi = new QTreeWidgetItem(_wcw->_accessList, QStringList() << *i);
+		denykeys.removeAll(walletName);
+		QTreeWidgetItem *twi = new QTreeWidgetItem(_wcw->_accessList, QStringList() << walletName);
 		for (QStringList::const_iterator j = apps.begin(); j != apps.end(); ++j) {
 			new QTreeWidgetItem(twi, QStringList() << QString() << *j << i18n("Always Allow"));
 		}
@@ -239,6 +259,28 @@ void KWalletConfig::load() {
 
 
 void KWalletConfig::save() {
+    QVariantMap args;
+    KAuth::Action *action = authAction();
+    if (0 == action) {
+        kDebug() << "There's no authAction, not saving settings";
+        return;
+    }
+    action->setArguments(args);
+
+    KAuth::ActionReply reply = action->execute();
+
+    if (reply.failed()) {
+        if (reply.type() == KAuth::ActionReply::KAuthError){
+            kDebug() << "Save action was not authorized!";
+            KMessageBox::error(this, i18n("Sorry, the system security policy didn't allow you to save the changes."), i18n("KDE Wallet Control Module"));
+        } else {
+            KMessageBox::error(this, reply.errorDescription(), i18n("KDE Wallet Control Module"));
+            kDebug() << "Save action failed. Not saving the settings.";
+        }
+        load();
+        return;
+    }
+
 	KConfigGroup config(_cfg, "Wallet");
 	config.writeEntry("Enabled", _wcw->_enabled->isChecked());
 	config.writeEntry("Launch Manager", _wcw->_launchManager->isChecked());
diff -pruN 4:4.11.3-1/src/konfigurator/kwallet.actions 4:4.14.2-1/src/konfigurator/kwallet.actions
--- 4:4.11.3-1/src/konfigurator/kwallet.actions	1970-01-01 00:00:00.000000000 +0000
+++ 4:4.14.2-1/src/konfigurator/kwallet.actions	2014-10-09 07:07:50.000000000 +0000
@@ -0,0 +1,128 @@
+[Domain]
+Name=KDE Wallet system
+Name[bs]=Sistem KDE novčanika
+Name[ca]=Sistema de carteres del KDE
+Name[ca@valencia]=Sistema de cartera del KDE
+Name[cs]=Systém úschovny pro KDE
+Name[da]=KDE's tegnebogssystem
+Name[de]=Passwortspeicher für KDE
+Name[el]=Σύστημα πορτοφολιού του KDE
+Name[en_GB]=KDE Wallet system
+Name[es]=Sistema de carteras de KDE
+Name[et]=KDE turvalaekasüsteem
+Name[eu]=KDEren zorro sistema
+Name[fi]=KDE:n lompakkojärjestelmä
+Name[fr]=Systèmes de portefeuilles de KDE
+Name[gl]=Sistema de carteiras de KDE
+Name[hu]=KDE jelszókezelő rendszer
+Name[ia]=KDE Wallet  System (Systema de portafolio de KDE)
+Name[it]=Il sistema di portafogli di KDE
+Name[kk]=KDE әмиян жүйесі
+Name[ko]=KDE 지갑 시스템
+Name[nb]=KDEs Lommebok-system
+Name[nds]=KDE-Knippensysteem
+Name[nl]=KDE-portefeuillesysteem
+Name[pa]=KDE ਵਾਲਿਟ ਸਿਸਟਮ
+Name[pl]=System portfela KDE
+Name[pt]=Sistema da Carteira do KDE
+Name[pt_BR]=Sistema de carteiras do KDE
+Name[ro]=Sistemul de portofele KDE
+Name[ru]=Бумажник KDE
+Name[sk]=Systém KDE peňaženky
+Name[sl]=Sistem listnic za KDE
+Name[sr]=КДЕ систем новчаника
+Name[sr@ijekavian]=КДЕ систем новчаника
+Name[sr@ijekavianlatin]=KDE sistem novčanika
+Name[sr@latin]=KDE sistem novčanika
+Name[sv]=KDE:s plånbokssystem
+Name[tr]=KDE Cüzdan Sistemi
+Name[uk]=Система роботи з буферами даних KDE
+Name[x-test]=xxKDE Wallet systemxx
+Name[zh_CN]=KDE 钱包系统
+Name[zh_TW]=KDE 錢包系統
+Icon=kwalletmanager
+
+[org.kde.kcontrol.kcmkwallet.save]
+Name=Save wallet configuration
+Name[bs]=Snimi konfiguraciju novčanika
+Name[ca]=Desa la configuració de la cartera
+Name[ca@valencia]=Guarda la configuració de la cartera
+Name[cs]=Uložit nastavení úschovny
+Name[da]=Gem konfiguration af tegnebog
+Name[de]=Einstellungen des Passwortspeichers speichern
+Name[el]=Αποθήκευση διαμόρφωσης πορτοφολιού KDE
+Name[en_GB]=Save wallet configuration
+Name[es]=Guardar la configuración de la cartera
+Name[et]=Turvalaeka seadistuse salvestamine
+Name[eu]=Gorde zorroaren Konfigurazioa
+Name[fi]=Tallenna lompakon asetukset
+Name[fr]=Enregistrer la configuration du portefeuille
+Name[gl]=Gardar a configuración da carteira
+Name[hu]=Jelszóbeállítások mentése
+Name[ia]=Salveguarda configuration de portafolio
+Name[it]=Salva la configurazione del portafogli
+Name[kk]=Әмиянның баптауын сақтау
+Name[ko]=지갑 저장 설정
+Name[nb]=Lagre lommebok-oppsett
+Name[nds]=Knippinstellen sekern
+Name[nl]=Portefeuille-instellingen opslaan
+Name[pa]=ਵਾਲਿਟ ਸੰਰਚਨਾ ਸੰਭਾਲੋ
+Name[pl]=Zapisz konfigurację portfela
+Name[pt]=Gravar a configuração da carteira
+Name[pt_BR]=Salvar a configuração da carteira
+Name[ro]=Salvează configurarea portofelului
+Name[ru]=Сохранение параметров бумажника
+Name[sk]=Uložiť nastavenie peňaženky
+Name[sl]=Shrani nastavitev listnice
+Name[sr]=Сачувај поставу новчаника
+Name[sr@ijekavian]=Сачувај поставу новчаника
+Name[sr@ijekavianlatin]=Sačuvaj postavu novčanika
+Name[sr@latin]=Sačuvaj postavu novčanika
+Name[sv]=Spara plånboksinställning
+Name[tr]=Cüzdan yapılandırmasını kaydet
+Name[uk]=Збереження налаштувань KWallet
+Name[x-test]=xxSave wallet configurationxx
+Name[zh_CN]=保存钱包配置
+Name[zh_TW]=儲存錢包設定
+Description=Allow saving wallet configuration settings
+Description[bs]=Dopusti snimanje postavki novčanika
+Description[ca]=Permet desar els paràmetres de configuració de la cartera
+Description[ca@valencia]=Permet guardar els paràmetres de configuració de la cartera
+Description[cs]=Povolit uložení nastavení úschovny
+Description[da]=Tillad gemning af tegnebogsindstillinger
+Description[de]=Ermöglicht es, die Einstellungen des Passwortspeichers zu speichern
+Description[el]=Να επιτρέπεται η αποθήκευση της διαμόρφωσης πορτοφολιού
+Description[en_GB]=Allow saving wallet configuration settings
+Description[es]=Permitir que se guarde la configuración de la cartera
+Description[et]=Turvalaeka seadistuse salvestamise lubamine
+Description[eu]=Baimendu zorroaren konfigurazio ezarpenak gordetzea
+Description[fi]=Salli lompakon asetusten tallentaminen
+Description[fr]=Autoriser l'enregistrement les paramètres de la configuration du portefeuille
+Description[gl]=Permite gardar a configuración da carteira
+Description[hu]=Lehetővé teszi a jelszóbeállítások mentését
+Description[ia]=Il permitte salveguardar preferentias de configuration de portafolio
+Description[it]=Permette il salvataggio della configurazione del portafogli
+Description[kk]=Әмиян баптау параметрлерін сақтауын рұқсат ету
+Description[ko]=지갑 설정 저장 허용
+Description[nb]=Kan lagre oppsettsinnstillingene for lommeboka
+Description[nds]=Sekern vun Knippinstellen tolaten
+Description[nl]=Opslaan van instellingen van de portefeuille toestaan
+Description[pl]=Zezwól na zapisywanie konfiguracji portfela
+Description[pt]=Permitir a gravação das definições da carteira
+Description[pt_BR]=Permite salvar as configurações da carteira
+Description[ro]=Permite salvarea parametrilor de configurare ai portofelului
+Description[ru]=Сохранение параметров бумажника
+Description[sk]=Umožniť ukladanie nastavenia peňaženky
+Description[sl]=Dovoli shranjevanje nastavitev listnice
+Description[sr]=Дозволи уписивање поставки новчаника
+Description[sr@ijekavian]=Дозволи уписивање поставки новчаника
+Description[sr@ijekavianlatin]=Dozvoli upisivanje postavki novčanika
+Description[sr@latin]=Dozvoli upisivanje postavki novčanika
+Description[sv]=Tillåt att plånboksinställningar sparas
+Description[tr]=Cüzdan yapılandırma ayarlarının kaydedilmesine izin ver
+Description[uk]=Дозволити зберігання параметрів налаштування KWallet
+Description[x-test]=xxAllow saving wallet configuration settingsxx
+Description[zh_CN]=允许保存钱包配置设定
+Description[zh_TW]=允許儲存錢包設定
+Policy=auth_self
+Persistence=session
diff -pruN 4:4.11.3-1/src/konfigurator/kwalletconfig.desktop 4:4.14.2-1/src/konfigurator/kwalletconfig.desktop
--- 4:4.11.3-1/src/konfigurator/kwalletconfig.desktop	2013-11-01 15:51:07.151093176 +0000
+++ 4:4.14.2-1/src/konfigurator/kwalletconfig.desktop	2014-10-09 07:07:50.000000000 +0000
@@ -21,13 +21,13 @@ Name[ca@valencia]=Cartera del KDE
 Name[cs]=Úschovna KDE
 Name[cy]=Waled KDE
 Name[da]=KDE's tegnebog
-Name[de]=Digitale Brieftasche
+Name[de]=KDE-Passwortspeicher
 Name[el]=Πορτοφόλι του KDE
 Name[en_GB]=KDE Wallet
 Name[eo]=KDE paperujo
 Name[es]=Cartera de KDE
 Name[et]=KDE turvalaegas
-Name[eu]=KDE Kartera
+Name[eu]=KDEren zorroa
 Name[fi]=KDE-lompakko
 Name[fr]=Portefeuille de KDE
 Name[ga]=KDE Wallet
@@ -51,7 +51,7 @@ Name[mr]=केडीई पाकीट
 Name[nb]=KDE Wallet
 Name[nds]=KDE-Knipp
 Name[ne]=केडीई वालेट
-Name[nl]=KDE Wallet
+Name[nl]=KDE Portefeuillebeheer
 Name[nn]=KDE-lommebok
 Name[pa]=KDE ਵਾਲਿਟ
 Name[pl]=Portfel KDE
@@ -91,13 +91,13 @@ Comment[ca@valencia]=Configuració de la
 Comment[cs]=Nastavení úschovny KDE
 Comment[cy]=Ffurfweddiad Waled KDE
 Comment[da]=Konfiguration af KDE's tegnebog
-Comment[de]=Einrichten der „digitalen Brieftasche“ (KWallet)
+Comment[de]=Einrichten des Passwortspeichers (KWallet)
 Comment[el]=Διαμόρφωση του πορτοφολιού του KDE
 Comment[en_GB]=KDE Wallet Configuration
 Comment[eo]=KDE paperuja agordo
 Comment[es]=Configuración de la cartera de KDE
 Comment[et]=KDE turvalaeka seadistamine
-Comment[eu]=KDE Karteraren Konfigurazioa
+Comment[eu]=KDEren zorroaren konfigurazioa
 Comment[fa]=KDE Wallet پیکربندی
 Comment[fi]=KDE-lompakon asetukset
 Comment[fr]=Configuration du portefeuille de KDE
@@ -125,7 +125,7 @@ Comment[ne]=केडीई वाले
 Comment[nl]=KDE-portefeuille instellen
 Comment[nn]=Oppsett av KDE-lommeboka
 Comment[pa]=KDE ਵਾਲਿਟ ਸੰਰਚਨਾ
-Comment[pl]=Konfiguracja Portfela KDE
+Comment[pl]=Konfiguracja portfela KDE
 Comment[pt]=Configuração da Carteira do KDE
 Comment[pt_BR]=Configuração da carteira do KDE
 Comment[ro]=Configurează portofelul KDE
@@ -155,10 +155,12 @@ X-KDE-Keywords[ca]=Cartera,Omplir formul
 X-KDE-Keywords[ca@valencia]=Cartera,Omplir formulari,Contrasenyes,Dades de formulari
 X-KDE-Keywords[cs]=Úschovna,Vyplnění formuláře,Hesla,Data formuláře
 X-KDE-Keywords[da]=tegnebog,formularudfyldning,adgangskoder,formulardata
-X-KDE-Keywords[de]=Geheimfach,Formular,Passwort,Brieftasche,digitale Brieftasche
+X-KDE-Keywords[de]=Geheimfach,Formular,Passwort,Passwortspeicher,Formulardaten
 X-KDE-Keywords[el]=Πορτοφόλι,συμπλήρωση φόρμας,κωδικοί πρόσβασης,δεδομένα φόρμας
+X-KDE-Keywords[en_GB]=Wallet,Form Fill,Passwords,Form Data
 X-KDE-Keywords[es]=Cartera,Rellenar formulario,Contraseñas,Datos de formulario
 X-KDE-Keywords[et]=turvalaegas,vormide täitmine,paroolid,vormiandmed
+X-KDE-Keywords[eu]=Zorroa, formularioak betetzea, pasahitzak, formularioko datuak
 X-KDE-Keywords[fi]=Lompakko,Lomakkeen täydennys,Lomakkeen täydentäminen,Salasanat,Lomaketiedot,Lomakkeiden tiedot
 X-KDE-Keywords[fr]=Portefeuille,remplissage de formulaires,mots de passe,données de formulaires
 X-KDE-Keywords[ga]=Wallet,Líonadh Foirmeacha,Focal Faire,Sonraí foirme
@@ -179,7 +181,7 @@ X-KDE-Keywords[pl]=Portfel,Wypełnienie
 X-KDE-Keywords[pt]=Carteira,Preenchimento de Formulários,Senhas,Dados de Formulários
 X-KDE-Keywords[pt_BR]=carteira,preencher formulário,senha,dados de formulário
 X-KDE-Keywords[ro]=portofel,completare formular,parole,date formular,formular
-X-KDE-Keywords[ru]=Wallet;Form Fill;Passwords;Form Data;бумажник;пароли;формы
+X-KDE-Keywords[ru]=Wallet,Form Fill,Passwords,Form Data,бумажник,пароли,формы
 X-KDE-Keywords[sk]=Peňaženka,Vypĺňanie formulárov,Heslá,Dáta formulára
 X-KDE-Keywords[sl]=listnica,dopolnjevanje obrazcev,gesla,podatki obrazcev
 X-KDE-Keywords[sr]=Wallet,Form Fill,Passwords,Form Data,новчаник,попуњавање формулара,лозинка
@@ -188,7 +190,7 @@ X-KDE-Keywords[sr@ijekavianlatin]=Wallet
 X-KDE-Keywords[sr@latin]=Wallet,Form Fill,Passwords,Form Data,novčanik,popunjavanje formulara,lozinka
 X-KDE-Keywords[sv]=Plånbok,Formulär,Lösenord,Formulärdata
 X-KDE-Keywords[tr]=Cüzdan,Form Doldurma,Parolalar,Form Verileri
-X-KDE-Keywords[uk]=кишеня,торбинка,форма,форми,заповнення форм,пароль,паролі,дані форми,реєстрація
+X-KDE-Keywords[uk]=кишеня;торбинка;форма;форми;заповнення форм;пароль;паролі;дані форми;реєстрація
 X-KDE-Keywords[x-test]=xxWallet,Form Fill,Passwords,Form Dataxx
 X-KDE-Keywords[zh_CN]=Wallet,Form Fill,Passwords,Form Data,钱包,表单填写,密码,表单数据
 X-KDE-Keywords[zh_TW]=Wallet,Form Fill,Passwords,Form Data
diff -pruN 4:4.11.3-1/src/konfigurator/kwalletmanager_show.desktop 4:4.14.2-1/src/konfigurator/kwalletmanager_show.desktop
--- 4:4.11.3-1/src/konfigurator/kwalletmanager_show.desktop	2013-11-01 15:51:07.151093176 +0000
+++ 4:4.14.2-1/src/konfigurator/kwalletmanager_show.desktop	2014-10-09 07:07:50.000000000 +0000
@@ -10,13 +10,13 @@ Name[ca@valencia]=Eina de gestió de car
 Name[cs]=Nástroj pro správu úschovny
 Name[cy]=Erfyn Rheoli Waled
 Name[da]=Håndteringsværktøj for tegnebog
-Name[de]=Verwaltung für digitale Brieftasche
+Name[de]=Passwortverwaltung
 Name[el]=Εργαλείο διαχείρισης πορτοφολιού
 Name[en_GB]=Wallet Management Tool
 Name[eo]=Paperuja administrilo
 Name[es]=Herramienta de gestión de cartera
 Name[et]=Turvalaeka haldur
-Name[eu]=Kartera Kudeatzeko Tresna
+Name[eu]=Zorroa kudeatzeko tresna
 Name[fa]=ابزار مدیریت  Wallet
 Name[fi]=Lompakonhallinta
 Name[fr]=Outil de gestion de portefeuilles
@@ -44,7 +44,7 @@ Name[ne]=वालेट व्यवस
 Name[nl]=Portefeuillebeheer
 Name[nn]=Wallet-administrasjonsverktøy
 Name[pa]=ਵਾਲਿਟ ਪਰਬੰਧਨ ਟੂਲ
-Name[pl]=Narzędzie do zarządzania Portfelem
+Name[pl]=Narzędzie do zarządzania portfelem
 Name[pt]=Ferramenta de Gestão da Carteira
 Name[pt_BR]=Ferramenta de gerenciamento de carteiras
 Name[ro]=Administrare portofel
diff -pruN 4:4.11.3-1/src/konfigurator/savehelper.cpp 4:4.14.2-1/src/konfigurator/savehelper.cpp
--- 4:4.11.3-1/src/konfigurator/savehelper.cpp	1970-01-01 00:00:00.000000000 +0000
+++ 4:4.14.2-1/src/konfigurator/savehelper.cpp	2014-10-09 07:07:50.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+   Copyright (C) 2013 Valentin Rusu <kde@rusu.info>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "savehelper.h"
+
+#include <kdebug.h>
+#include <unistd.h>
+
+#if defined(Q_CC_MSVC)
+// TODO: or rather use uid_t in the getuid() call below?
+#define __uid_t uid_t
+#endif
+
+ActionReply SaveHelper::save(QVariantMap args)
+{
+    __uid_t uid = getuid();
+    kDebug() << "executing uid=" << uid;
+
+    return ActionReply::SuccessReply;
+}
+
+KDE4_AUTH_HELPER_MAIN("org.kde.kcontrol.kcmkwallet", SaveHelper)
diff -pruN 4:4.11.3-1/src/konfigurator/savehelper.h 4:4.14.2-1/src/konfigurator/savehelper.h
--- 4:4.11.3-1/src/konfigurator/savehelper.h	1970-01-01 00:00:00.000000000 +0000
+++ 4:4.14.2-1/src/konfigurator/savehelper.h	2014-10-09 07:07:50.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   Copyright (C) 2013 Valentin Rusu <kde@rusu.info>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef _SAVEHELPER_H_
+#define _SAVEHELPER_H_
+
+#include <kauth.h>
+
+using namespace KAuth;
+
+class SaveHelper : public QObject {
+    Q_OBJECT;
+public slots:
+    ActionReply save(QVariantMap args);
+};
+
+#endif // _SAVEHELPER_H_
diff -pruN 4:4.11.3-1/src/konfigurator/walletconfigwidget.ui 4:4.14.2-1/src/konfigurator/walletconfigwidget.ui
--- 4:4.11.3-1/src/konfigurator/walletconfigwidget.ui	2013-08-28 17:08:58.085862109 +0000
+++ 4:4.14.2-1/src/konfigurator/walletconfigwidget.ui	2014-10-09 07:07:50.000000000 +0000
@@ -19,7 +19,7 @@
        <item>
         <widget class="QCheckBox" name="_enabled">
          <property name="whatsThis">
-          <string>&lt;p&gt;The wallet subsystem provides a convenient and secure way to manage all your passwords.  This option specifies whether or not you want to use it.&lt;/p&gt;</string>
+          <string>&lt;p&gt;The wallet subsystem provides a convenient and secure way to manage all your passwords. This option specifies whether or not you want to use it.&lt;/p&gt;</string>
          </property>
          <property name="text">
           <string>&amp;Enable the KDE wallet subsystem</string>
diff -pruN 4:4.11.3-1/src/manager/allyourbase.cpp 4:4.14.2-1/src/manager/allyourbase.cpp
--- 4:4.11.3-1/src/manager/allyourbase.cpp	2013-08-28 17:08:58.085862109 +0000
+++ 4:4.14.2-1/src/manager/allyourbase.cpp	2014-10-09 07:07:50.000000000 +0000
@@ -340,7 +340,8 @@ void KWalletItem::processDropEvent(QDrop
  *  KWalletEntryList - A listview to store wallet entries
  */
 KWalletEntryList::KWalletEntryList(QWidget *parent, const char *name)
-: QTreeWidget(parent) {
+: QTreeWidget(parent),
+    _wallet(0) {
 	setObjectName( QLatin1String( name ) );
 	setColumnCount(1);
 	setHeaderLabel(i18n("Folders"));
diff -pruN 4:4.11.3-1/src/manager/kwalleteditor.cpp 4:4.14.2-1/src/manager/kwalleteditor.cpp
--- 4:4.11.3-1/src/manager/kwalleteditor.cpp	2013-08-28 17:08:58.087862096 +0000
+++ 4:4.14.2-1/src/manager/kwalleteditor.cpp	2014-10-09 07:07:50.000000000 +0000
@@ -179,6 +179,7 @@ void KWalletEditor::setWallet(KWallet::W
     _nonLocal = isPath;
 
     _w = wallet;
+    _entryList->setWallet(_w);
     connect(_w, SIGNAL(walletOpened(bool)), this, SLOT(walletOpened(bool)));
     connect(_w, SIGNAL(walletClosed()), this, SLOT(walletClosed()));
     connect(_w, SIGNAL(folderUpdated(QString)), this, SLOT(updateEntries(QString)));
@@ -189,6 +190,9 @@ void KWalletEditor::setWallet(KWallet::W
     emit enableWalletActions(true);
     emit enableContextFolderActions(true);
 
+    _mapEditorShowHide->setChecked(false);
+    showHideMapEditorValue(false);
+
     setFocus();
     _searchLine->setFocus();
 }
@@ -490,7 +494,7 @@ void KWalletEditor::entryEditted() {
 
 void KWalletEditor::entrySelectionChanged(QTreeWidgetItem *item) {
     // do not forget to save changes
-    if ( _saveChanges->isEnabled() && (_displayedItem != item) ){
+    if ( _saveChanges->isEnabled() && _displayedItem && (_displayedItem != item) ){
         if ( KMessageBox::Yes ==  KMessageBox::questionYesNo(this, 
                                             i18n("The contents of the current item has changed.\nDo you want to save changes?"))) {
             saveEntry();
@@ -556,13 +560,12 @@ void KWalletEditor::entrySelectionChange
                     }
 				} else if (ci->entryType() == KWallet::Wallet::Map) {
 					_entryStack->setCurrentIndex(2);
-					_mapEditorShowHide->setChecked(false);
-					showHideMapEditorValue(false);
 					if (_w->readMap(item->text(0), _currentMap) == 0) {
 						_mapEditor->reload();
 						_entryName->setText(i18n("Name-Value Map: %1", item->text(0)));
 						_saveChanges->setEnabled(false);
 						_undoChanges->setEnabled(false);
+                        showHideMapEditorValue(_mapEditorShowHide->isChecked());
 					}
 				} else if (ci->entryType() == KWallet::Wallet::Stream) {
 					_entryStack->setCurrentIndex(3);
@@ -889,6 +892,7 @@ void KWalletEditor::deleteEntry() {
 				KMessageBox::error(this, i18n("An unexpected error occurred trying to delete the entry"));
 				return;
 			}
+            _displayedItem = 0;
 			_w->removeEntry(item->text(0));
 			delete item;
 			entrySelectionChanged(_entryList->currentItem());
@@ -898,8 +902,9 @@ void KWalletEditor::deleteEntry() {
 	}
 }
 
-void KWalletEditor::changePassword() {
-	KWallet::Wallet::changePassword(_walletName, winId());
+void KWalletEditor::changePassword()
+{
+    KWallet::Wallet::changePassword(_walletName, effectiveWinId());
 }
 
 
diff -pruN 4:4.11.3-1/src/manager/kwalletmanager.cpp 4:4.14.2-1/src/manager/kwalletmanager.cpp
--- 4:4.11.3-1/src/manager/kwalletmanager.cpp	2013-08-28 17:08:58.087862096 +0000
+++ 4:4.14.2-1/src/manager/kwalletmanager.cpp	2014-10-09 07:07:50.000000000 +0000
@@ -62,7 +62,7 @@ KWalletManager::KWalletManager(QWidget *
 	m_kwalletdModule = 0;
 	KConfig cfg( QLatin1String( "kwalletrc" )); // not sure why this setting isn't in kwalletmanagerrc...
 	KConfigGroup walletConfigGroup(&cfg, "Wallet");
-	if (walletConfigGroup.readEntry("Launch Manager", true)) {
+	if (walletConfigGroup.readEntry("Launch Manager", false)) {
 		_tray = new KStatusNotifierItem(this);
 		_tray->setObjectName( QLatin1String("kwalletmanager tray" ));
         _tray->setCategory( KStatusNotifierItem::SystemServices );
@@ -121,6 +121,11 @@ KWalletManager::KWalletManager(QWidget *
 	action->setText(i18n("&New Wallet..."));
 	action->setIcon(KIcon( QLatin1String( "kwalletmanager" )));
 	connect(action, SIGNAL(triggered()), SLOT(createWallet()));
+
+    action = actionCollection()->addAction(QLatin1String( "wallet_open") );
+    action->setText(i18n("Open Wallet..."));
+    connect(action, SIGNAL(triggered()), this, SLOT(openWallet()));
+    
     action = actionCollection()->addAction(QLatin1String( "wallet_delete" ));
     action->setText(i18n("&Delete Wallet..."));
     action->setIcon(KIcon( QLatin1String( "trash-empty" )));
@@ -220,9 +225,9 @@ void KWalletManager::closeWallet(const Q
 	updateWalletDisplay();
 }
 
-
-void KWalletManager::changeWalletPassword(const QString& walletName) {
-	KWallet::Wallet::changePassword(walletName, winId());
+void KWalletManager::changeWalletPassword(const QString &walletName)
+{
+    KWallet::Wallet::changePassword(walletName, effectiveWinId());
 }
 
 
@@ -302,8 +307,8 @@ void KWalletManager::createWallet() {
         // attempt open the wallet to create it, then dispose it
         // as it'll appear in on the main window via the walletCreated signal
         // emmitted by the kwalletd
-        KWallet::Wallet::openWallet(n, winId());
-	}
+        KWallet::Wallet::openWallet(n, effectiveWinId());
+    }
 }
 
 void KWalletManager::deleteWallet()
@@ -321,8 +326,7 @@ void KWalletManager::deleteWallet()
 
 void KWalletManager::openWallet(const QString& walletName)
 {
-    Q_UNUSED(walletName);
-    qWarning("TODO: implement openWallet from name");
+    _managerWidget->openWallet(walletName);
 }
 
 void KWalletManager::openWallet()
diff -pruN 4:4.11.3-1/src/manager/kwalletmanagerwidget.cpp 4:4.14.2-1/src/manager/kwalletmanagerwidget.cpp
--- 4:4.11.3-1/src/manager/kwalletmanagerwidget.cpp	2013-08-28 17:08:58.088862089 +0000
+++ 4:4.14.2-1/src/manager/kwalletmanagerwidget.cpp	2014-10-09 07:07:50.000000000 +0000
@@ -106,6 +106,17 @@ bool KWalletManagerWidget::openWalletFil
     return false;
 }
 
+bool KWalletManagerWidget::openWallet(const QString& name)
+{
+    bool result = false;
+    if (_walletPages.contains(name)) {
+        KWalletManagerWidgetItem *wi = _walletPages[name];
+        setCurrentPage(wi);
+        result = wi->openWallet();
+    }
+    return result;
+}
+
 const QString& KWalletManagerWidget::activeWalletName() const
 {
     return qobject_cast<KWalletManagerWidgetItem*>(currentPage())->walletName();
diff -pruN 4:4.11.3-1/src/manager/kwalletmanagerwidget.h 4:4.14.2-1/src/manager/kwalletmanagerwidget.h
--- 4:4.11.3-1/src/manager/kwalletmanagerwidget.h	2013-08-28 17:08:58.088862089 +0000
+++ 4:4.14.2-1/src/manager/kwalletmanagerwidget.h	2014-10-09 07:07:50.000000000 +0000
@@ -35,6 +35,7 @@ public:
     void updateWalletDisplay(QString selectWallet = QString());
     bool hasWallet(const QString&) const;
     bool openWalletFile(const QString& path);
+    bool openWallet(const QString& name);
 
     const QString& activeWalletName() const;
 
diff -pruN 4:4.11.3-1/src/manager/kwalletmanagerwidgetitem.cpp 4:4.14.2-1/src/manager/kwalletmanagerwidgetitem.cpp
--- 4:4.11.3-1/src/manager/kwalletmanagerwidgetitem.cpp	2013-08-28 17:08:58.088862089 +0000
+++ 4:4.14.2-1/src/manager/kwalletmanagerwidgetitem.cpp	2014-10-09 07:07:50.000000000 +0000
@@ -41,4 +41,9 @@ void KWalletManagerWidgetItem::updateWal
     _controlWidget->updateWalletDisplay();
 }
 
+bool KWalletManagerWidgetItem::openWallet()
+{
+    return _controlWidget->openWallet();
+}
+
 #include "kwalletmanagerwidgetitem.moc"
diff -pruN 4:4.11.3-1/src/manager/kwalletmanagerwidgetitem.h 4:4.14.2-1/src/manager/kwalletmanagerwidgetitem.h
--- 4:4.11.3-1/src/manager/kwalletmanagerwidgetitem.h	2013-08-28 17:08:58.088862089 +0000
+++ 4:4.14.2-1/src/manager/kwalletmanagerwidgetitem.h	2014-10-09 07:07:50.000000000 +0000
@@ -30,6 +30,7 @@ public:
 
     void updateWalletDisplay();
     const QString& walletName() const { return _walletName; }
+    bool openWallet();
 
 private:
     WalletControlWidget *_controlWidget;
diff -pruN 4:4.11.3-1/src/manager/main.cpp 4:4.14.2-1/src/manager/main.cpp
--- 4:4.11.3-1/src/manager/main.cpp	2013-08-28 17:08:58.088862089 +0000
+++ 4:4.14.2-1/src/manager/main.cpp	2014-10-09 07:07:50.000000000 +0000
@@ -41,16 +41,16 @@ class MyApp : public KUniqueApplication
 };
 
 int main(int argc, char **argv) {
-	KAboutData about("kwalletmanager", 0, ki18n("KDE Wallet Manager"), "1.10",
+	KAboutData about("kwalletmanager", 0, ki18n("KDE Wallet Manager"), "2.0",
 		ki18n("KDE Wallet Management Tool"),
 		KAboutData::License_GPL,
 		ki18n("(c) 2003,2004 George Staikos"), KLocalizedString(),
 		"http://utils.kde.org/projects/kwalletmanager");
 
-	about.addAuthor(ki18n("Michael Leupold"), ki18n("Maintainer"), "lemma@confuego.org");
+    about.addAuthor(ki18n("Valentin Rusu"), ki18n("Maintainer, user interface refactoring"), "kde@rusu.info");
 	about.addAuthor(ki18n("George Staikos"), ki18n("Original author and former maintainer"), "staikos@kde.org");
+    about.addAuthor(ki18n("Michael Leupold"), ki18n("Developer and former maintainer"), "lemma@confuego.org");
 	about.addAuthor(ki18n("Isaac Clerencia"), ki18n("Developer"), "isaac@warp.es");
-    about.addAuthor(ki18n("Valentin Rusu"), ki18n("Developer - user interface refactoring"), "kde@rusu.info");
 
 	KCmdLineArgs::init(argc, argv, &about);
 
diff -pruN 4:4.11.3-1/src/manager/walletcontrolwidget.cpp 4:4.14.2-1/src/manager/walletcontrolwidget.cpp
--- 4:4.11.3-1/src/manager/walletcontrolwidget.cpp	2013-08-28 17:08:58.088862089 +0000
+++ 4:4.14.2-1/src/manager/walletcontrolwidget.cpp	2014-10-09 07:07:50.000000000 +0000
@@ -45,35 +45,51 @@ WalletControlWidget::WalletControlWidget
     QTimer::singleShot(1, this, SLOT(onSetupWidget()));
 }
 
+bool WalletControlWidget::openWallet()
+{
+    bool result = false;
+    if (_wallet && _wallet->isOpen()) {
+        result = true; // already opened
+    } else {
+        _wallet = KWallet::Wallet::openWallet(_walletName, effectiveWinId());
+        result = _wallet != 0;
+        onSetupWidget();
+    }
+    return result;
+}
+
 void WalletControlWidget::onSetupWidget()
 {
     if (KWallet::Wallet::isOpen(_walletName)) {
         if (0 == _wallet) {
-            _wallet = KWallet::Wallet::openWallet(_walletName, winId());
-            Q_ASSERT(_wallet != 0);
-        }
-        if (_wallet) {
-            connect(_wallet, SIGNAL(walletClosed()), this, SLOT(onWalletClosed()));
-            _openClose->setText(i18n("&Close"));
-
-            if (0 == _walletEditor) {
-                _walletEditor = new KWalletEditor(_editorFrame);
-                _editorFrameLayout->addWidget(_walletEditor);
-                _walletEditor->setVisible(true);
+            _wallet = KWallet::Wallet::openWallet(_walletName, effectiveWinId());
+            if (0 == _wallet) {
+                kDebug() << "Weird situation: wallet could not be opened when setting-up the widget.";
             }
-            _walletEditor->setWallet(_wallet);
+        }
+    }
 
-            if (0 == _applicationsManager) {
-                _applicationsManager = new ApplicationsManager(_applicationsFrame);
-                _applicationsFrameLayout->addWidget(_applicationsManager);
-                _applicationsManager->setVisible(true);
-            }
-            _applicationsManager->setWallet(_wallet);
+    if (_wallet) {
+        connect(_wallet, SIGNAL(walletClosed()), this, SLOT(onWalletClosed()));
+        _openClose->setText(i18n("&Close"));
+
+        if (0 == _walletEditor) {
+            _walletEditor = new KWalletEditor(_editorFrame);
+            _editorFrameLayout->addWidget(_walletEditor);
+            _walletEditor->setVisible(true);
+        }
+        _walletEditor->setWallet(_wallet);
 
-            _changePassword->setEnabled(true);
-            _stateLabel->setText(i18nc("the 'kdewallet' is currently open (e.g. %1 will be replaced with current wallet name)", "The '%1' wallet is currently open", _walletName));
-            _tabs->setTabIcon(0, QIcon::fromTheme( QLatin1String("wallet-open")).pixmap(16));
+        if (0 == _applicationsManager) {
+            _applicationsManager = new ApplicationsManager(_applicationsFrame);
+            _applicationsFrameLayout->addWidget(_applicationsManager);
+            _applicationsManager->setVisible(true);
         }
+        _applicationsManager->setWallet(_wallet);
+
+        _changePassword->setEnabled(true);
+        _stateLabel->setText(i18nc("the 'kdewallet' is currently open (e.g. %1 will be replaced with current wallet name)", "The '%1' wallet is currently open", _walletName));
+        _tabs->setTabIcon(0, QIcon::fromTheme( QLatin1String("wallet-open")).pixmap(16));
     } else {
         _openClose->setText(i18n("&Open..."));
 
@@ -111,9 +127,8 @@ void WalletControlWidget::onOpenClose()
         } else {
             _wallet = 0;
         }
-    }
-    else {
-        _wallet = KWallet::Wallet::openWallet(_walletName, winId());
+    } else {
+        _wallet = KWallet::Wallet::openWallet(_walletName, window()->winId());
     }
     onSetupWidget();
 }
@@ -146,7 +161,7 @@ void WalletControlWidget::onDisconnectAp
 
 void WalletControlWidget::onChangePassword()
 {
-    KWallet::Wallet::changePassword(_walletName, winId());
+    KWallet::Wallet::changePassword(_walletName, effectiveWinId());
 }
 
 void WalletControlWidget::hideEvent(QHideEvent* )
diff -pruN 4:4.11.3-1/src/manager/walletcontrolwidget.h 4:4.14.2-1/src/manager/walletcontrolwidget.h
--- 4:4.11.3-1/src/manager/walletcontrolwidget.h	2013-08-28 17:08:58.088862089 +0000
+++ 4:4.14.2-1/src/manager/walletcontrolwidget.h	2014-10-09 07:07:50.000000000 +0000
@@ -34,6 +34,8 @@ class WalletControlWidget : public QWidg
 public:
     WalletControlWidget(QWidget* parent, const QString& walletName);
 
+    bool openWallet();
+
 public Q_SLOTS:
     void onSetupWidget();
     void onOpenClose();
diff -pruN 4:4.11.3-1/src/manager/walletwidget.ui 4:4.14.2-1/src/manager/walletwidget.ui
--- 4:4.11.3-1/src/manager/walletwidget.ui	2013-08-28 17:08:58.088862089 +0000
+++ 4:4.14.2-1/src/manager/walletwidget.ui	2014-10-09 07:07:50.000000000 +0000
@@ -174,6 +174,9 @@
                <family>Monospace</family>
               </font>
              </property>
+             <property name="acceptRichText">
+              <bool>false</bool>
+             </property>
             </widget>
            </item>
           </layout>
diff -pruN 4:4.11.3-1/TODO 4:4.14.2-1/TODO
--- 4:4.11.3-1/TODO	2013-06-28 17:39:19.903042822 +0000
+++ 4:4.14.2-1/TODO	2014-10-09 07:07:50.000000000 +0000
@@ -1,13 +1,14 @@
 Things left:
 
 Backend:
-- test 64 bit, zSeries
+- test zSeries
 - refactor the hashes to make it efficient
 
 Integration:
 - Cookie jar
-- KMail
 
 Future ideas:
 - Make it a kpart
 
+GPG
+- Provide a backend conversion tool to help switching from blowfish to GPG or viceversa
