commit 7f5ce0e4e0c87a965f0c006b8c432505c6863210
Author: Jonathan Riddell <jr@jriddell.org>
Date:   Tue May 23 12:32:18 2017 +0100

    Update version number for 5.8.7
    GIT_SILENT

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f3a55f..5c752b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(user-manager)
 cmake_minimum_required(VERSION 2.8.12)
-set(PROJECT_VERSION "5.8.6")
+set(PROJECT_VERSION "5.8.7")
 
 find_package(ECM 1.3.0 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})

commit 826e41429917f6c1534e84e8b7821b8b53675910
Author: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date:   Mon May 8 23:10:26 2017 +0200

    Make sure the new avatar is always saved
    
    Summary:
    The KIO job needs to be run synchronously, otherwise the KCM might be
    deleted before the job finished. This happens when closing the KCM
    module with the Ok button, or when closing the System Settings window
    and clicking Apply.
    
    BUG: 350836
    FIXED-IN: 5.8.7
    
    Test Plan: Change avatar from System Settings, then close System Settings and click Apply.
    
    Reviewers: #plasma, jriddell
    
    Subscribers: plasma-devel
    
    Tags: #plasma
    
    Differential Revision: https://phabricator.kde.org/D5779

diff --git a/src/accountinfo.cpp b/src/accountinfo.cpp
index 8818c3f..50e8b2f 100644
--- a/src/accountinfo.cpp
+++ b/src/accountinfo.cpp
@@ -188,7 +188,8 @@ bool AccountInfo::save()
         KIO::CopyJob* moveJob = KIO::move(QUrl::fromLocalFile(path), QUrl::fromLocalFile(faceFile), KIO::HideProgressInfo);
         connect(moveJob, SIGNAL(finished(KJob*)), SLOT(avatarModelChanged(KJob*)));
         moveJob->setUiDelegate(0);
-        moveJob->start();
+        // Run it synchronously to be sure the job ends before the KCM gets deleted.
+        moveJob->exec();
 
         QString faceFile2 = QDesktopServices::storageLocation(QDesktopServices::HomeLocation);
         faceFile2.append(QLatin1String("/.face.icon"));

commit 78bfa37045f50d39962354c0682750a68ec4d785
Author: Jonathan Riddell <jr@jriddell.org>
Date:   Tue Feb 21 11:50:51 2017 +0000

    Update version number for 5.8.6
    GIT_SILENT

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c7103f..5f3a55f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(user-manager)
 cmake_minimum_required(VERSION 2.8.12)
-set(PROJECT_VERSION "5.8.5")
+set(PROJECT_VERSION "5.8.6")
 
 find_package(ECM 1.3.0 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})

commit 6585c0208aaa85725eadb032b26393f685d80fd5
Author: l10n daemon script <scripty@kde.org>
Date:   Thu Feb 16 08:09:55 2017 +0100

    SVN_SILENT made messages (.desktop file) - always resolve ours
    
    In case of conflict in i18n, keep the version of the branch "ours"
    To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

diff --git a/src/user_manager.desktop b/src/user_manager.desktop
index 69b7beb..c855e0b 100644
--- a/src/user_manager.desktop
+++ b/src/user_manager.desktop
@@ -23,6 +23,7 @@ Name[el]=Διαχειριστής χρηστών
 Name[en_GB]=User Manager
 Name[es]=Gestor de usuarios
 Name[et]=Kasutajahaldus
+Name[eu]=Erabiltzaile-kudeatzailea
 Name[fi]=Käyttäjienhallinta
 Name[fr]=Gestionnaire d'utilisateurs
 Name[gl]=Xestor de usuarios
@@ -68,6 +69,7 @@ Comment[el]=Προσθήκη, αφαίρεση ή επεξεργασία των
 Comment[en_GB]=Add, remove or edit system users
 Comment[es]=Añadir, eliminar o editar usuarios del sistema
 Comment[et]=Süsteemi kasutajate lisamine, eemaldamine ja muutmine
+Comment[eu]=Erantsi, kendu edo editatu sistemako erabiltzaileak
 Comment[fi]=Järjestelmän käyttäjien lisääminen, poistaminen ja muokkaaminen
 Comment[fr]=Ajoute, supprime ou modifie des utilisateurs système
 Comment[gl]=Engadir, eliminar e editar usuarios do sistema.
@@ -112,6 +114,7 @@ X-KDE-Keywords[el]=χρήστες,σύστημα,διαχείριση
 X-KDE-Keywords[en_GB]=users,system,administration
 X-KDE-Keywords[es]=usuarios,sistema,administración
 X-KDE-Keywords[et]=kasutajad,süsteem,haldamine,haldus
+X-KDE-Keywords[eu]=erabiltzaileak,sistema,administrazioa
 X-KDE-Keywords[fi]=käyttäjät,järjestelmä,ylläpito,hallinnointi
 X-KDE-Keywords[fr]=utilisateurs, système, administration
 X-KDE-Keywords[gl]=users,system,administration,usuarios,sistema,administración,xestión