[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#858613: unblock: kwin/4:5.8.6-1



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Dear release team,

KDE Plasma 5.8 is an LTS release that I consider fit to be updated in stretch. 
This particular request is for kwin 5.8.6.

The fixes included in the kwin 5.8.6 release are: 
 translation updates
 6 bug fixes:
   + Find minimum required Breeze version instead of current version (cb481b4)
     This is a somewhat Debian specific fix, noticed by upstream
   + Avoid a crash on Kwin decoration KCM teardown (70d2fb2) (Closes: 846508)
     KDE#373628
   + Support modifier-only-shortcuts when capslock is on (5a87fa3 0acfebd)
     KDE#375355
   + Translate the layout name when passing to layout change OSD (a3be3e8e)
   + Fixed initial graying out options in Cube Effect settings (a43049f)
   + [TabBox] Remember current model index on SwitcherItem model set (e019c9f)
      KDE#333511

Also in the 5.8.5 release there was an extra bug fix:
   + Align configure button consistently across delegates (d0e0f6c)
     KDE#372685

On the Debian side of changes we improve the runtime dependencies (#848523 
#855410), update the description for kwin wayland (#848524).

The full debdiff is about 1.4M, mostly changes in the po files, so I'm 
publishing it in:
 https://freak.gnuservers.com.ar/~maxy/debian/kwin_5.8.6_unblock/
I'm attaching a poless version of the debdiff, and the full upstream gitlog 
between versions 5.8.4 and 5.8.6.

Currently 4:5.8.4-1 is in stretch, 4:5.8.5-2 is in unstable (I misunderstood 
the reply to #857633, sorry), and I would like to upload 4:5.8.6-1 for stretch 
if this gets approved.

Please unblock package kwin

Happy hacking,

unblock kwin/4:5.8.6-1

- -- System Information:
Debian Release: 9.0
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'testing'), (500, 'stable'), (50, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf

Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)

-----BEGIN PGP SIGNATURE-----

iQJEBAEBCgAuFiEE+JIdOnQEyG4RNSIVxxl2mbKbIyoFAljVKTYQHG1heHlAZGVi
aWFuLm9yZwAKCRDHGXaZspsjKhCCD/9zv/4MsWJHmntpar2kd3/jpXTZKSA5KHgm
BL4yOiKZDPQ9nonpNl7tanYjw48ULcfJwTotsqfGSLjRVCO5P8IylZM6npwjChoy
6qzpaka0s5VKK8RtCLsq2FGuN99J0n1I9QbbMpdwcADRjxxam3cXLUQ0GADz0QfR
S53PijltrHmm6l9VCNuKWfaDUI/i1LJYhmTh9pdTmEegmuO+Hl5lYC9gDtt8+p8c
wY+H4ccV69blYOTUzCV7yaTkxwFAzOpsOXcvVzlaiaiTcNwgDx8ZKSVa76ZuQBQe
DV4XnMtaTeItmkdZpMKHaOraoqld8I7U+Mv+cCiCF4tQTfurBqS8W1Qr1r9Wc+dT
sxSCfTr+0TgcQOWkh+oJ6Qzbx2qdW71I5uX0JR690Ot+O3QkPhyVj3mkRg8kqRyO
e2iE40x+jhYhSqvBdQZj//28LnfA6E0bOxUB2XPG5wmqkQ6BoYZbn5dcaGb8JYhU
6TaxK/lmD9/BlrnvvS6a5J0DBv72VTOHcaeidCLZgu6B2M4ChZEqDmkTofKeS6jL
UJGjdI5JfL1RQB4o4SwzIhXCZj73QOL7hdHaMJACAkcmtOFRPzVRHHRXaMzU5uB7
7x4XImkh6f5bxAhAY06BtagwWnMHY2bGKhgS6SxnKwvpXnPBo6ORZN9CtaTU+soN
bTA/HwIK7g==
=8ql5
-----END PGP SIGNATURE-----
commit 9b84e56392d6578352efe98ad37e49c98ec3a0fa
Author: Jonathan Riddell <jr@jriddell.org>
Date:   Tue Feb 21 11:43:38 2017 +0000

    Update version number for 5.8.6
    GIT_SILENT

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a68381278..9c3f0d068 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(KWIN)
-set(PROJECT_VERSION "5.8.5")
+set(PROJECT_VERSION "5.8.6")
 set(PROJECT_VERSION_MAJOR 5)
 
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)

commit cb481b492271860586c69298395e2ba118239406
Author: Martin Gräßlin <mgraesslin@kde.org>
Date:   Fri Feb 17 07:09:29 2017 +0100

    Find minimum required Breeze version instead of current version
    
    Summary:
    So far KWin put a version requirement on Breeze which is the current
    version number of KWin. This is technically correct, but distributions
    seem to have problems with it. E.g. I noticed twice in Debian testing
    that kwin defaults to Plastik which happens when Breeze is not found.
    I reported it, it got fixed, now it's again broken.
    
    Thus I think that distributions have problems with the requirement of
    building Breeze prior to KWin. As KWin does not depend on the minor
    version, let's depend only on the actual required version, which is
    5.8 in the 5.8 branch, 5.9 in the 5.9 branch and master.
    
    Reviewers: #kwin, #plasma
    
    Subscribers: plasma-devel, kwin
    
    Tags: #kwin
    
    Differential Revision: https://phabricator.kde.org/D4644

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab636cd35..a68381278 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,7 +120,7 @@ set_package_properties(KScreenLocker PROPERTIES
                        TYPE REQUIRED
                        PURPOSE "For screenlocker integration in kwin_wayland")
 
-find_package(Breeze ${PROJECT_VERSION} CONFIG)
+find_package(Breeze 5.8.0 CONFIG)
 set_package_properties(Breeze PROPERTIES
                        TYPE OPTIONAL
                        PURPOSE "For setting the default window decoration plugin")

commit 70d2fb2378d636ef6d052da08417b27c99182fb0
Author: David Edmundson <kde@davidedmundson.co.uk>
Date:   Fri Feb 10 10:52:48 2017 +0100

    Avoid a crash on Kwin decoration KCM teardown
    
    Summary:
    As described in https://bugreports.qt.io/browse/QTBUG-57714  exposing a
    QWidget as a context item to QtQuick can crash. Especially as the
    engine's context property gets deleted whilst deleting the parent item.
    
    This patch reworks the code so that the models are exposed to QML
    directly rather than going through a QWidget.
    
    CCBUG: 373628
    
    Test Plan:
    Pressing back whilst in the decoration KCM used to crash every time, now it doesn't.
    I still have the buttons.
    
    Reviewers: #plasma, graesslin
    
    Reviewed By: #plasma, graesslin
    
    Subscribers: graesslin, cfeck, plasma-devel
    
    Tags: #plasma
    
    Differential Revision: https://phabricator.kde.org/D4533

diff --git a/kcmkwin/kwindecoration/kcm.cpp b/kcmkwin/kwindecoration/kcm.cpp
index 035bc8b2a..231b3e6a8 100644
--- a/kcmkwin/kwindecoration/kcm.cpp
+++ b/kcmkwin/kwindecoration/kcm.cpp
@@ -100,7 +100,10 @@ ConfigurationModule::ConfigurationModule(QWidget *parent, const QVariantList &ar
     m_quickView->rootContext()->setContextProperty(QStringLiteral("decorationsModel"), m_proxyModel);
     updateColors();
     m_quickView->rootContext()->setContextProperty("_borderSizesIndex", 3); // 3 is normal
-    m_quickView->rootContext()->setContextProperty("configurationModule", this);
+    m_quickView->rootContext()->setContextProperty("leftButtons", m_leftButtons);
+    m_quickView->rootContext()->setContextProperty("rightButtons", m_rightButtons);
+    m_quickView->rootContext()->setContextProperty("availableButtons", m_availableButtons);
+
     m_quickView->rootContext()->setContextProperty("titleFont", QFontDatabase::systemFont(QFontDatabase::TitleFont));
     m_quickView->setResizeMode(QQuickView::SizeRootObjectToView);
     m_quickView->setSource(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kwin/kcm_kwindecoration/main.qml"))));
@@ -406,21 +409,6 @@ void ConfigurationModule::showKNS(const QString &config)
     delete downloadDialog;
 }
 
-QAbstractItemModel *ConfigurationModule::leftButtons() const
-{
-    return m_leftButtons;
-}
-
-QAbstractItemModel *ConfigurationModule::rightButtons() const
-{
-    return m_rightButtons;
-}
-
-QAbstractItemModel *ConfigurationModule::availableButtons() const
-{
-    return m_availableButtons;
-}
-
 bool ConfigurationModule::eventFilter(QObject *watched, QEvent *e)
 {
     if (watched != m_ui) {
diff --git a/kcmkwin/kwindecoration/kcm.h b/kcmkwin/kwindecoration/kcm.h
index 1d7ee7378..99fa43114 100644
--- a/kcmkwin/kwindecoration/kcm.h
+++ b/kcmkwin/kwindecoration/kcm.h
@@ -47,17 +47,10 @@ public:
 class ConfigurationModule : public KCModule
 {
     Q_OBJECT
-    Q_PROPERTY(QAbstractItemModel* leftButtons READ leftButtons CONSTANT)
-    Q_PROPERTY(QAbstractItemModel* rightButtons READ rightButtons CONSTANT)
-    Q_PROPERTY(QAbstractItemModel* availableButtons READ availableButtons CONSTANT)
 public:
     explicit ConfigurationModule(QWidget *parent = nullptr, const QVariantList &args = QVariantList());
     virtual ~ConfigurationModule();
 
-    QAbstractItemModel *leftButtons() const;
-    QAbstractItemModel *rightButtons() const;
-    QAbstractItemModel *availableButtons() const;
-
     bool eventFilter(QObject *watched, QEvent *e) override;
 
 public Q_SLOTS:
diff --git a/kcmkwin/kwindecoration/qml/Buttons.qml b/kcmkwin/kwindecoration/qml/Buttons.qml
index 2e6487306..64ab0f9be 100644
--- a/kcmkwin/kwindecoration/qml/Buttons.qml
+++ b/kcmkwin/kwindecoration/qml/Buttons.qml
@@ -63,7 +63,7 @@ Item {
                         id: leftButtonsView
                         anchors.left: parent.left;
                         height: buttonPreviewRow.height
-                        model: configurationModule.leftButtons
+                        model: leftButtons
                         key: "decoButtonLeft"
                     }
                     Item {
@@ -81,7 +81,7 @@ Item {
                         id: rightButtonsView
                         anchors.right: parent.right;
                         height: buttonPreviewRow.height
-                        model: configurationModule.rightButtons
+                        model: rightButtons
                         key: "decoButtonRight"
                     }
                     DropArea {
@@ -144,7 +144,7 @@ Item {
             GridView {
                 id: availableGrid
                 Layout.fillWidth: true
-                model: configurationModule.availableButtons
+                model: availableButtons
                 interactive: false
                 cellWidth: iconLabel.implicitWidth
                 cellHeight: units.iconSizes.small + iCannotBelieveIDoThis.implicitHeight + 4*units.smallSpacing

commit 5a87fa3f92cfc29944b8dc66c2320e3062b532ee
Author: Martin Gräßlin <mgraesslin@kde.org>
Date:   Sun Jan 22 09:44:15 2017 +0100

    Support modifier-only-shortcuts when capslock is on
    
    Summary:
    So far we didn't trigger modifier-only-shortcuts when capslock was
    enabled. In fact we even ensured that the shortcuts did not trigger.
    This seems not to be what our users expect. Meta should still trigger
    if capslock is on.
    
    This change modifies the logic to determine which modifier is currently
    pressed by using the modifiersRelevantForGlobalShortcuts. The difference
    to the "normal" modifiers is that this excludes capslock from modifiers
    and excludes consumed modifiers. The latter is not really relevant as
    modifier-only-shortcuts do not trigger if multiple keys are pressed,
    which is required to have a modifier consumed.
    
    BUG: 375355
    FIXED-IN: 5.8.6
    
    Test Plan: Only with adjusted autotest
    
    Reviewers: #kwin, #plasma
    
    Subscribers: plasma-devel, kwin
    
    Tags: #kwin
    
    Differential Revision: https://phabricator.kde.org/D4241

diff --git a/autotests/integration/modifier_only_shortcut_test.cpp b/autotests/integration/modifier_only_shortcut_test.cpp
index 1b304d86c..d610c7456 100644
--- a/autotests/integration/modifier_only_shortcut_test.cpp
+++ b/autotests/integration/modifier_only_shortcut_test.cpp
@@ -251,7 +251,7 @@ void ModifierOnlyShortcutTest::testTrigger()
 void ModifierOnlyShortcutTest::testCapsLock()
 {
     // this test verifies that Capslock does not trigger the shift shortcut
-    // and that the shift modifier on capslock does not trigger either
+    // but other shortcuts still trigger even when Capslock is on
     Target target;
     QSignalSpy triggeredSpy(&target, &Target::shortcutTriggered);
     QVERIFY(triggeredSpy.isValid());
@@ -278,13 +278,13 @@ void ModifierOnlyShortcutTest::testCapsLock()
     QCOMPARE(triggeredSpy.count(), 1);
 
     // currently caps lock is on
-    // shift is ignored
+    // shift still triggers
     kwinApp()->platform()->keyboardKeyPressed(modifier, timestamp++);
     kwinApp()->platform()->keyboardKeyReleased(modifier, timestamp++);
     QCOMPARE(input()->keyboardModifiers(), Qt::ShiftModifier);
-    QCOMPARE(triggeredSpy.count(), 1);
+    QCOMPARE(triggeredSpy.count(), 2);
 
-    // meta on the other hand should trigger
+    // meta should also trigger
     group.writeEntry("Meta", QStringList{s_serviceName, s_path, s_serviceName, QStringLiteral("shortcut")});
     group.writeEntry("Alt", QStringList());
     group.writeEntry("Shift", QStringList{});
@@ -295,15 +295,21 @@ void ModifierOnlyShortcutTest::testCapsLock()
     QCOMPARE(input()->keyboardModifiers(), Qt::ShiftModifier | Qt::MetaModifier);
     QCOMPARE(input()->keyboard()->xkb()->modifiersRelevantForGlobalShortcuts(), Qt::MetaModifier);
     kwinApp()->platform()->keyboardKeyReleased(KEY_LEFTMETA, timestamp++);
-    QEXPECT_FAIL("", "BUG 375355", Continue);
-    QCOMPARE(triggeredSpy.count(), 2);
+    QCOMPARE(triggeredSpy.count(), 3);
+
+    // set back to shift to ensure we don't trigger with capslock
+    group.writeEntry("Meta", QStringList());
+    group.writeEntry("Alt", QStringList());
+    group.writeEntry("Shift", QStringList{s_serviceName, s_path, s_serviceName, QStringLiteral("shortcut")});
+    group.writeEntry("Control", QStringList());
+    group.sync();
+    workspace()->slotReconfigure();
 
     // release caps lock
     kwinApp()->platform()->keyboardKeyPressed(KEY_CAPSLOCK, timestamp++);
     kwinApp()->platform()->keyboardKeyReleased(KEY_CAPSLOCK, timestamp++);
     QCOMPARE(input()->keyboardModifiers(), Qt::NoModifier);
-    QEXPECT_FAIL("", "BUG 375355", Continue);
-    QCOMPARE(triggeredSpy.count(), 2);
+    QCOMPARE(triggeredSpy.count(), 3);
 }
 
 void ModifierOnlyShortcutTest::testGlobalShortcutsDisabled_data()
diff --git a/keyboard_input.cpp b/keyboard_input.cpp
index 9a1c3f4f9..d1866ae4e 100644
--- a/keyboard_input.cpp
+++ b/keyboard_input.cpp
@@ -286,7 +286,7 @@ void Xkb::updateKey(uint32_t key, InputRedirection::KeyboardKeyState state)
     if (!m_keymap || !m_state) {
         return;
     }
-    const auto oldMods = m_modifiers;
+    const auto oldMods = modifiersRelevantForGlobalShortcuts();
     xkb_state_update_key(m_state, key + 8, static_cast<xkb_key_direction>(state));
     if (state == InputRedirection::KeyboardKeyPressed) {
         const auto sym = toKeysym(key);
@@ -314,14 +314,14 @@ void Xkb::updateKey(uint32_t key, InputRedirection::KeyboardKeyState state)
             !ScreenLockerWatcher::self()->isLocked() &&
             oldMods == Qt::NoModifier &&
             m_input->qtButtonStates() == Qt::NoButton) {
-            m_modOnlyShortcut.modifier = Qt::KeyboardModifier(int(m_modifiers));
+            m_modOnlyShortcut.modifier = Qt::KeyboardModifier(int(modifiersRelevantForGlobalShortcuts()));
         } else {
             m_modOnlyShortcut.modifier = Qt::NoModifier;
         }
     } else {
         m_modOnlyShortcut.pressCount--;
         if (m_modOnlyShortcut.pressCount == 0 &&
-            m_modifiers == Qt::NoModifier &&
+            modifiersRelevantForGlobalShortcuts() == Qt::NoModifier &&
             !workspace()->globalShortcutsDisabled()) {
             if (m_modOnlyShortcut.modifier != Qt::NoModifier) {
                 const auto list = options->modifierOnlyDBusShortcut(m_modOnlyShortcut.modifier);

commit a3be3e8e80b68c8e8ae93034aeb139df0ad7055a
Author: Martin Gräßlin <mgraesslin@kde.org>
Date:   Sun Jan 22 11:55:33 2017 +0100

    Translate the layout name when passing to layout change OSD
    
    Summary:
    Xkbcommon does not localize the layout names. We always get the US
    English variant. KWin so far passed the strings from xkbcommon directly
    to UI visible parts such as the Plasma OSD. This results in not
    translated elements in our UI.
    
    As I figured out today the translations exist in the domain
    xkeyboard-config. Passing the strings from xkbcommon through this domain
    gives us translated layouts.
    
    Unfortunately the xkeyboard-config is not installed by default on all
    distributions. E.g. on ubuntu/neon one needs to install xkb-data-i18n
    to have the translations available.
    
    Test Plan: Untested as I fail to start Plasma/5.8 KWin on my dev system
    
    Reviewers: #kwin, #plasma
    
    Subscribers: plasma-devel, kwin
    
    Tags: #kwin
    
    Differential Revision: https://phabricator.kde.org/D4243

diff --git a/keyboard_input.cpp b/keyboard_input.cpp
index bb6b37739..9a1c3f4f9 100644
--- a/keyboard_input.cpp
+++ b/keyboard_input.cpp
@@ -33,6 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KScreenLocker/KsldApp>
 // Frameworks
 #include <KKeyServer>
+#include <KLocalizedString>
 #include <KGlobalAccel>
 // Qt
 #include <QDBusConnection>
@@ -385,7 +386,7 @@ void Xkb::updateModifiers()
             QStringLiteral("org.kde.osdService"),
             QStringLiteral("kbdLayoutChanged"));
 
-            msg << QString::fromLocal8Bit(xkb_keymap_layout_get_name(m_keymap, layout));
+            msg << i18nd("xkeyboard-config", xkb_keymap_layout_get_name(m_keymap, layout));
 
             QDBusConnection::sessionBus().asyncCall(msg);
         }

commit 0acfebd96bace0fefd7c4291617f1d07f96ca03e
Author: Martin Gräßlin <mgraesslin@kde.org>
Date:   Sat Jan 21 20:13:09 2017 +0100

    [autotests] Add test case for modifier only trigger when capslock enabled
    
    This extends the testCapsLock to ensure that modifier only shortcut
    trigger when capslock is enabled. So far the test only ensured that
    capslock doesn't trigger the shift modifier only shortcut.
    
    As the test shows currently when capslock is on, the meta key doesn't
    trigger any more.
    
    CCBUG: 375355

diff --git a/autotests/integration/modifier_only_shortcut_test.cpp b/autotests/integration/modifier_only_shortcut_test.cpp
index 68feb70ac..1b304d86c 100644
--- a/autotests/integration/modifier_only_shortcut_test.cpp
+++ b/autotests/integration/modifier_only_shortcut_test.cpp
@@ -20,6 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "kwin_wayland_test.h"
 #include "cursor.h"
 #include "input.h"
+#include "keyboard_input.h"
 #include "platform.h"
 #include "screens.h"
 #include "wayland_server.h"
@@ -283,11 +284,26 @@ void ModifierOnlyShortcutTest::testCapsLock()
     QCOMPARE(input()->keyboardModifiers(), Qt::ShiftModifier);
     QCOMPARE(triggeredSpy.count(), 1);
 
+    // meta on the other hand should trigger
+    group.writeEntry("Meta", QStringList{s_serviceName, s_path, s_serviceName, QStringLiteral("shortcut")});
+    group.writeEntry("Alt", QStringList());
+    group.writeEntry("Shift", QStringList{});
+    group.writeEntry("Control", QStringList());
+    group.sync();
+    workspace()->slotReconfigure();
+    kwinApp()->platform()->keyboardKeyPressed(KEY_LEFTMETA, timestamp++);
+    QCOMPARE(input()->keyboardModifiers(), Qt::ShiftModifier | Qt::MetaModifier);
+    QCOMPARE(input()->keyboard()->xkb()->modifiersRelevantForGlobalShortcuts(), Qt::MetaModifier);
+    kwinApp()->platform()->keyboardKeyReleased(KEY_LEFTMETA, timestamp++);
+    QEXPECT_FAIL("", "BUG 375355", Continue);
+    QCOMPARE(triggeredSpy.count(), 2);
+
     // release caps lock
     kwinApp()->platform()->keyboardKeyPressed(KEY_CAPSLOCK, timestamp++);
     kwinApp()->platform()->keyboardKeyReleased(KEY_CAPSLOCK, timestamp++);
     QCOMPARE(input()->keyboardModifiers(), Qt::NoModifier);
-    QCOMPARE(triggeredSpy.count(), 1);
+    QEXPECT_FAIL("", "BUG 375355", Continue);
+    QCOMPARE(triggeredSpy.count(), 2);
 }
 
 void ModifierOnlyShortcutTest::testGlobalShortcutsDisabled_data()

commit c0be6a45f07b3ca96c7d0c210e2e9159192771db
Author: l10n daemon script <scripty@kde.org>
Date:   Sat Jan 21 09:00:54 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/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop
index d8741bb57..e09d55a22 100644
--- a/effects/eyeonscreen/package/metadata.desktop
+++ b/effects/eyeonscreen/package/metadata.desktop
@@ -3,6 +3,7 @@ Name=eye On Screen
 Name[ca]=Ull a la pantalla
 Name[ca@valencia]=Ull a la pantalla
 Name[da]=øjet på skærmen
+Name[de]=Ansicht der Arbeitsfläche
 Name[en_GB]=eye On Screen
 Name[es]=Ojo a la pantalla
 Name[et]=eye On Screen
@@ -39,6 +40,7 @@ Comment=Suck windows into desktop to show the latter. This might remind you of s
 Comment[ca]=Enganxa les finestres a l'escriptori per a mostrar la darrera. Això podria recordar-vos quelcom.
 Comment[ca@valencia]=Enganxa les finestres a l'escriptori per a mostrar la darrera. Això podria recordar-vos quelcom.
 Comment[da]=Sug vinduer ind i skrivebordet for at vise dette. Måske minder det dig om noget.
+Comment[de]=Saugt Fenster in die Arbeitsfläche, um sie anzuzeigen.
 Comment[en_GB]=Suck windows into desktop to show the latter. This might remind you of something.
 Comment[es]=Succionar las ventanas en el escritorio para mostrarlo. Esto debe recordarle algo.
 Comment[et]=Imeb aknad töölauda ja näitab viimast. See võib midagi meenutada ...
diff --git a/effects/morphingpopups/package/metadata.desktop b/effects/morphingpopups/package/metadata.desktop
index de6a1139d..17e869b5a 100644
--- a/effects/morphingpopups/package/metadata.desktop
+++ b/effects/morphingpopups/package/metadata.desktop
@@ -3,6 +3,7 @@ Comment=Cross fade animation when Tooltips or Notifications change their geometr
 Comment[ca]=Animació d'esvaïment creuat quan els consells d'eines o les notificacions canvien la seva geometria
 Comment[ca@valencia]=Animació d'esvaïment creuat quan els consells d'eines o les notificacions canvien la seua geometria
 Comment[da]=Crossfade-animation når værktøjstip og bekendtgørelser skifter geometry
+Comment[de]=Überblendende Animationen, wenn Kurzinfos oder Benachrichtigungen ihre Geometrie ändern
 Comment[en_GB]=Cross fade animation when Tooltips or Notifications change their geometry
 Comment[es]=Animación de transición suave cuando las ayudas emergentes o las notificaciones cambian su geometría
 Comment[et]=Animatsioon hääbumisega, kui kohtspikrid või märguanded muudavad geomeetriat
@@ -36,6 +37,7 @@ Name=Morphing popups
 Name[ca]=Missatges emergents en metamorfosi
 Name[ca@valencia]=Missatges emergents en metamorfosi
 Name[da]=Sammensmeltende pop-op'er
+Name[de]=Verformende Aufklappfenster
 Name[en_GB]=Morphing popups
 Name[es]=Transformación de ventanas emergentes
 Name[et]=Moonduvad hüpikdialoogid
diff --git a/plugins/platforms/hwcomposer/hwcomposer.json b/plugins/platforms/hwcomposer/hwcomposer.json
index 22e284cb0..5c6a5eb6e 100644
--- a/plugins/platforms/hwcomposer/hwcomposer.json
+++ b/plugins/platforms/hwcomposer/hwcomposer.json
@@ -4,6 +4,7 @@
         "Description[ca@valencia]": "Renderitza mitjançant el «hwcomposer» mitjançant «libhybris».", 
         "Description[ca]": "Renderitza mitjançant el «hwcomposer» mitjançant «libhybris».", 
         "Description[da]": "Rendér igennem hwcomposer igennem libhybris.", 
+        "Description[de]": "In hwcomposer mit libhybris rendern.", 
         "Description[el]": "Αποτύπωση μέσω hwcomposer μέσω libhybris.", 
         "Description[es]": "Renderizar a través «hwcomposer» mediante «libhybris».", 
         "Description[et]": "Renderdamine hwcomposeris libhybrise abil.", 
diff --git a/plugins/platforms/wayland/wayland.json b/plugins/platforms/wayland/wayland.json
index 656dee225..8a4b3f497 100644
--- a/plugins/platforms/wayland/wayland.json
+++ b/plugins/platforms/wayland/wayland.json
@@ -4,6 +4,7 @@
         "Description[ca@valencia]": "Renderitza a una finestra imbricada en un compositor Wayland en execució.", 
         "Description[ca]": "Renderitza a una finestra imbricada en un compositor Wayland en execució.", 
         "Description[da]": "Rendér til et indlejret vindue på kørende Wayland-compositor.", 
+        "Description[de]": "In ein eingebettetes Fenster auf dem laufenden Wayland-Kompositor rendern.", 
         "Description[el]": "Αποτύπωση σε εμφωλευμένο παράθυρο κατά την εκτέλεση του συνθέτη Wayland.", 
         "Description[es]": "Renderizar en una ventana anidada en el compositor Wayland en ejecución.", 
         "Description[et]": "Renderdamine töötava Waylandi komposiitori pesastatud aknas.", 
diff --git a/plugins/platforms/x11/standalone/x11.json b/plugins/platforms/x11/standalone/x11.json
index c5de0da90..98f09d1d4 100644
--- a/plugins/platforms/x11/standalone/x11.json
+++ b/plugins/platforms/x11/standalone/x11.json
@@ -4,6 +4,7 @@
         "Description[ca@valencia]": "Connector de plataforma per una X11 autònoma en el kwin_x11.", 
         "Description[ca]": "Connector de plataforma per una X11 autònoma en el kwin_x11.", 
         "Description[da]": "Platform-plugin til standalone x11 i kwin_x11.", 
+        "Description[de]": "Plattform-Modul für ein selbstständiges X11 in kwin_x11.", 
         "Description[el]": "Πρόσθετο πλατφόρμας για αυτόνομο x11 και kwin_x11.", 
         "Description[es]": "Complemento de Platform para X11 autónomo en kwin_x11.", 
         "Description[et]": "Autonoomse x11 platvormi plugin kwin_x11-s", 
@@ -32,6 +33,7 @@
         "Name": "x11-standalone", 
         "Name[ca@valencia]": "X11-autònoma", 
         "Name[ca]": "X11-autònoma", 
+        "Name[de]": "Selbständiges-x11", 
         "Name[el]": "x11-αυτόνομος", 
         "Name[es]": "x11-autónomo", 
         "Name[gl]": "x11-independente", 
diff --git a/plugins/platforms/x11/windowed/x11.json b/plugins/platforms/x11/windowed/x11.json
index fbaa5fdb1..84ac0a055 100644
--- a/plugins/platforms/x11/windowed/x11.json
+++ b/plugins/platforms/x11/windowed/x11.json
@@ -4,6 +4,7 @@
         "Description[ca@valencia]": "Renderitza a una finestra imbricada en el sistema de finestres X11.", 
         "Description[ca]": "Renderitza a una finestra imbricada en el sistema de finestres X11.", 
         "Description[da]": "Rendér til et indlejret vindue på X11-vinduessystemet.", 
+        "Description[de]": "In ein eingebettetes Fenster auf X11-Fenstersystemen rendern.", 
         "Description[el]": "Αποτύπωση σε εμφωλευμένο παράθυρο σε παραθυρικό σύστημα X11.", 
         "Description[es]": "Renderizar en una ventana anidada en el sistema de ventanas X11.", 
         "Description[et]": "Pesastatud akna renderdamine X11 aknasüsteemis.", 

commit a43049f6880c2da7d71a6eb9bd7acf6dd95e7b20
Author: Rafał Szalecki <rafal_szalecki@poczta.onet.pl>
Date:   Sat Jan 21 00:16:30 2017 +0100

    Fixed initial graying out options in Cube Effect settings
    
    Typically after deselecting "Show caps" option, the associated options "Cap color" and "Display image on caps" are grayed out (triggered by signal). The bug was when Desktop Cube settings were closed and opened again then the options were not grayed out.
    
    Succesfully compiled and tested by deselecting "Show caps" option in Desktop Cube settings, closing the settings window and opening it once again. The options "Cap color" and "Display image on caps" were then grayed out.
    
    REVIEW: 129194

diff --git a/effects/cube/cube_config.cpp b/effects/cube/cube_config.cpp
index 9bae19277..0939b6725 100644
--- a/effects/cube/cube_config.cpp
+++ b/effects/cube/cube_config.cpp
@@ -82,6 +82,7 @@ CubeEffectConfig::CubeEffectConfig(QWidget* parent, const QVariantList& args) :
 
     m_ui->editor->addCollection(m_actionCollection);
 
+    capsSelectionChanged();
     connect(m_ui->kcfg_Caps, SIGNAL(stateChanged(int)), this, SLOT(capsSelectionChanged()));
     m_ui->kcfg_Wallpaper->setFilter(QStringLiteral("*.png *.jpeg *.jpg "));
     addConfig(CubeConfig::self(), m_ui);

commit e019c9f61edf20c433ac4bf2e3546ce9b5c1104a
Author: Roman Gilg <subdiff@gmail.com>
Date:   Mon Jan 16 19:11:07 2017 +0100

    [TabBox] Remember current model index on SwitcherItem model set
    
    In case we need to set the SwitcherItem model in
    `TabBoxHandlerPrivate::show()`, remember the current index row,
    otherwise it gets reset to the first item.
    
    Reviewers: #kwin, graesslin
    
    Tags: #kwin
    
    Differential Revision: https://phabricator.kde.org/D4162
    
    BUG: 333511

diff --git a/tabbox/tabboxhandler.cpp b/tabbox/tabboxhandler.cpp
index 90681748b..afaf5a12f 100644
--- a/tabbox/tabboxhandler.cpp
+++ b/tabbox/tabboxhandler.cpp
@@ -323,6 +323,9 @@ void TabBoxHandlerPrivate::show()
         }
     }
     if (SwitcherItem *item = switcherItem()) {
+        // In case the model isn't yet set (see below), index will be reset and therefore we
+        // need to save the current index row (https://bugs.kde.org/show_bug.cgi?id=333511).
+        int indexRow = index.row();
         if (!item->model()) {
             QAbstractItemModel *model = nullptr;
             if (desktopMode) {
@@ -333,7 +336,7 @@ void TabBoxHandlerPrivate::show()
             item->setModel(model);
         }
         item->setAllDesktops(config.clientDesktopMode() == TabBoxConfig::AllDesktopsClients);
-        item->setCurrentIndex(index.row());
+        item->setCurrentIndex(indexRow);
         // everything is prepared, so let's make the whole thing visible
         item->setVisible(true);
     }

commit 4d3809f8e314b602e566ba42469ca3a0836b3e88
Author: Jonathan Riddell <jr@jriddell.org>
Date:   Tue Dec 27 09:27:02 2016 +0000

    Update version number for 5.8.5
    GIT_SILENT

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56e554d0c..ab636cd35 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(KWIN)
-set(PROJECT_VERSION "5.8.4")
+set(PROJECT_VERSION "5.8.5")
 set(PROJECT_VERSION_MAJOR 5)
 
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)

commit 818ed8f4ad7dd1d8bd58b70dde073aded791f371
Author: l10n daemon script <scripty@kde.org>
Date:   Tue Dec 13 05:42:59 2016 +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/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop
index b1eac06b3..d8741bb57 100644
--- a/effects/eyeonscreen/package/metadata.desktop
+++ b/effects/eyeonscreen/package/metadata.desktop
@@ -6,6 +6,7 @@ Name[da]=øjet på skærmen
 Name[en_GB]=eye On Screen
 Name[es]=Ojo a la pantalla
 Name[et]=eye On Screen
+Name[eu]=begia pantailan
 Name[fi]=eye On Screen
 Name[fr]=Jeter un oeil sur le bureau
 Name[gl]=Ollo na pantalla
@@ -41,6 +42,7 @@ Comment[da]=Sug vinduer ind i skrivebordet for at vise dette. Måske minder det
 Comment[en_GB]=Suck windows into desktop to show the latter. This might remind you of something.
 Comment[es]=Succionar las ventanas en el escritorio para mostrarlo. Esto debe recordarle algo.
 Comment[et]=Imeb aknad töölauda ja näitab viimast. See võib midagi meenutada ...
+Comment[eu]=Xurgatu mahaigaineko leihoak, berau erakusteko. Honek zer edo zer gogoraraziko diezazuke.
 Comment[fi]=Imee ikkunat työpöytään näyttääkseen sen. Tämä saattaa muistuttaa sinua jostain.
 Comment[fr]=Aspire toutes les fenêtres pour afficher le bureau.
 Comment[gl]=Que o escritorio succione as xanelas para mostrarse. Isto pode que lle recorde a algo.
diff --git a/effects/fade/package/metadata.desktop b/effects/fade/package/metadata.desktop
index adfa1d085..2669c1432 100644
--- a/effects/fade/package/metadata.desktop
+++ b/effects/fade/package/metadata.desktop
@@ -17,7 +17,7 @@ Name[en_GB]=Fade
 Name[eo]=Dissolvi
 Name[es]=Fundido
 Name[et]=Hääbumine
-Name[eu]=Iraungi
+Name[eu]=Desagertzea
 Name[fa]=محو کردن
 Name[fi]=Häivytys
 Name[fr]=Fondu
diff --git a/effects/fadedesktop/package/metadata.desktop b/effects/fadedesktop/package/metadata.desktop
index a426a9afc..a392a4774 100644
--- a/effects/fadedesktop/package/metadata.desktop
+++ b/effects/fadedesktop/package/metadata.desktop
@@ -15,7 +15,7 @@ Name[en_GB]=Fade Desktop
 Name[eo]=Labortablo Dissolvo  
 Name[es]=Difuminar escritorio
 Name[et]=Töölaua hääbumine
-Name[eu]=Iraungi mahaigaina
+Name[eu]=Mahaigaina desagertzea
 Name[fi]=Työpöydän häivytys
 Name[fr]=Effectue un fondu du bureau
 Name[fy]=Buroblêd ferfagje
@@ -83,7 +83,7 @@ Comment[en_GB]=Fade between virtual desktops when switching between them
 Comment[eo]=Disvolvi inter virtualaj labortabloj kiam ŝaltas inter ili.
 Comment[es]=Difumina al cambiar entre escritorios virtuales
 Comment[et]=Hääbumisefekt ühelt virtuaalselt töölaualt teisele lülitudes
-Comment[eu]=Uneko mahaigaina iraungitzen du mahagain batetik bestera aldatzean
+Comment[eu]=Uneko mahaigaina desagerrarazi mahagain batetik bestera aldatzean
 Comment[fi]=Häivytys virtuaalityöpöytien välillä niitä vaihdettaessa
 Comment[fr]=Effectue un fondu entre les bureaux virtuels lors des changements de bureau
 Comment[fy]=By it wikseljen tusken firuele buroblêden in ferfaging dwaan
diff --git a/effects/flipswitch/flipswitch_config.desktop b/effects/flipswitch/flipswitch_config.desktop
index 80993834d..f29bda35c 100644
--- a/effects/flipswitch/flipswitch_config.desktop
+++ b/effects/flipswitch/flipswitch_config.desktop
@@ -19,7 +19,7 @@ Name[en_GB]=Flip Switch
 Name[eo]=Turna ŝanĝilo
 Name[es]=Selección de ventana en modo cascada
 Name[et]=Aknalehitseja
-Name[eu]=Leiho pila
+Name[eu]=Biratze aldaketa
 Name[fi]=Kääntövaihtaja
 Name[fr]=Empilement en perspective
 Name[fy]=Flip wiksel
diff --git a/effects/glide/glide_config.desktop b/effects/glide/glide_config.desktop
index 377a5b207..e801c0620 100644
--- a/effects/glide/glide_config.desktop
+++ b/effects/glide/glide_config.desktop
@@ -18,7 +18,7 @@ Name[el]=Ολίσθηση
 Name[en_GB]=Glide
 Name[es]=Glide
 Name[et]=Liuglemine
-Name[eu]=Lerratu
+Name[eu]=Irristatzea
 Name[fi]=Ikkunaliuku
 Name[fr]=Glisser
 Name[ga]=Sleamhnaigh
diff --git a/effects/maximize/package/metadata.desktop b/effects/maximize/package/metadata.desktop
index a1d7863a5..a05d6ad54 100644
--- a/effects/maximize/package/metadata.desktop
+++ b/effects/maximize/package/metadata.desktop
@@ -10,7 +10,7 @@ Comment[el]=Εφέ κίνησης για παράθυρο που πρόκειτ
 Comment[en_GB]=Animation for a window going to maximise/restore from maximise
 Comment[es]=Animación para una ventana que se va a maximizar o restaurar de una maximización
 Comment[et]=Maksimeeritava või maksimeeritust taastatava akna animatsioon
-Comment[eu]=Leihoa maximizatzera doanerako/maximizatutik leheneratzen denerako animazioa
+Comment[eu]=Leihoa maximizatzera/maximizatutik leheneratzera doanerako animazioa
 Comment[fi]=Animointi ikkunalle, joka suurennetaan tai palautetaan suurennuksesta
 Comment[fr]=Animation pour une fenêtre passant d'un état maximisé vers un état maximisé / restauré
 Comment[gl]=Animación das xanelas que se maximizan ou restauran maximizadas
diff --git a/effects/morphingpopups/package/metadata.desktop b/effects/morphingpopups/package/metadata.desktop
index a51fd3edb..de6a1139d 100644
--- a/effects/morphingpopups/package/metadata.desktop
+++ b/effects/morphingpopups/package/metadata.desktop
@@ -6,6 +6,7 @@ Comment[da]=Crossfade-animation når værktøjstip og bekendtgørelser skifter g
 Comment[en_GB]=Cross fade animation when Tooltips or Notifications change their geometry
 Comment[es]=Animación de transición suave cuando las ayudas emergentes o las notificaciones cambian su geometría
 Comment[et]=Animatsioon hääbumisega, kui kohtspikrid või märguanded muudavad geomeetriat
+Comment[eu]=Desagertze gurutzatua tresnen argibideek edo jakinarazpenek geometria aldatzen dutenean
 Comment[fi]=Häivytysanimaatio työkaluvihjeiden tai ilmoitusten koon muuttuessa
 Comment[fr]=Animation de fondu quand les infobulles ou les notifications changent de forme
 Comment[gl]=Usar unha animación de esvaemento cando a xeometría das mensaxes emerxentes de axuda ou notificación cambia.
@@ -38,6 +39,7 @@ Name[da]=Sammensmeltende pop-op'er
 Name[en_GB]=Morphing popups
 Name[es]=Transformación de ventanas emergentes
 Name[et]=Moonduvad hüpikdialoogid
+Name[eu]=Eraldatzen diren gainerakorrak
 Name[fi]=Ponnahdusikkunoiden muodonmuutos
 Name[fr]=Fondu des menus surgissants
 Name[gl]=Xanelas emerxentes cambiantes
diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop
index d632e294c..bb284946e 100644
--- a/effects/windowaperture/package/metadata.desktop
+++ b/effects/windowaperture/package/metadata.desktop
@@ -9,6 +9,7 @@ Name[el]=Διάφραγμα παραθύρου
 Name[en_GB]=Window Aperture
 Name[es]=Apertura de ventanas
 Name[et]=Aknaava
+Name[eu]=Leihoa irekitzea
 Name[fi]=Ikkunoiden siirto näytön kulmiin
 Name[fr]=Ouverture de la fenêtre
 Name[gl]=Apertura das xanelas
@@ -45,6 +46,7 @@ Comment[el]=Μετακίνηση παραθύρου στις γωνίες κατ
 Comment[en_GB]=Move window into the corners while showing desktop
 Comment[es]=Mover las ventanas a las esquinas cuando se muestra el escritorio
 Comment[et]=Akende viimine nurkadesse töölauda näidates
+Comment[eu]=Mugitu leihoa izkinetan mahaigana erakutsi bitartean
 Comment[fi]=Siirrä ikkunat näytön kulmiin työpöydän näyttämisen ajaksi
 Comment[fr]=Déplace les fenêtres dans les coins en affichant le bureau
 Comment[gl]=Mover a xanela ás esquinas mentres se mostra o escritorio.
diff --git a/kcmkwin/kwincompositing/kcmkwineffects.desktop b/kcmkwin/kwincompositing/kcmkwineffects.desktop
index a5683b999..66e59d330 100644
--- a/kcmkwin/kwincompositing/kcmkwineffects.desktop
+++ b/kcmkwin/kwincompositing/kcmkwineffects.desktop
@@ -24,6 +24,7 @@ Name[el]=Εφέ επιφάνειας εργασίας
 Name[en_GB]=Desktop Effects
 Name[es]=Efectos del escritorio
 Name[et]=Töölauaefektid
+Name[eu]=Mahaigaineko efektuak
 Name[fi]=Työpöytätehosteet
 Name[fr]=Effets de bureau
 Name[gl]=Efectos do escritorio
@@ -70,6 +71,7 @@ Comment[el]=Εφέ επιφάνειας εργασίας
 Comment[en_GB]=Desktop Effects
 Comment[es]=Efectos del escritorio
 Comment[et]=Töölauaefektid
+Comment[eu]=Mahaigaineko efektuak
 Comment[fi]=Työpöytätehosteet
 Comment[fr]=Effets de bureau
 Comment[gl]=Efectos do escritorio
diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop
index cb3c19372..5796766f8 100644
--- a/kcmkwin/kwincompositing/kwincompositing.desktop
+++ b/kcmkwin/kwincompositing/kwincompositing.desktop
@@ -24,6 +24,7 @@ Name[el]=Συνθέτης
 Name[en_GB]=Compositor
 Name[es]=Compositor
 Name[et]=Komposiitor
+Name[eu]=Konposatzailea
 Name[fi]=Koostin
 Name[fr]=Compositeur
 Name[gl]=Compositor
@@ -67,6 +68,7 @@ Comment[el]=Ρυθμίσεις συνθέτη για τα εφέ επιφάνε
 Comment[en_GB]=Compositor Settings for Desktop Effects
 Comment[es]=Configurar las preferencias del compositor para los efectos del escritorio
 Comment[et]=Komposiitori seadistused töölauaefektide tarbeks
+Comment[eu]=Konposatzailearen ezarpenak mahaigaineko efektuetarako
 Comment[fi]=Koostimen asetukset työpöytätehosteita varten
 Comment[fr]=Paramétrage du compositeur pour les effets de bureau
 Comment[gl]=Configuración do compositor para os efectos de escritorio
@@ -106,6 +108,7 @@ X-KDE-Keywords[de]=kwin,Fenstermanager,Fensterverwaltung,Effekt,Fenster,Composit
 X-KDE-Keywords[en_GB]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,animation speed
 X-KDE-Keywords[es]=kwin,ventana,gestor,composición,efecto,efectos 3D,efectos 2D,OpenGL,XRender,preferencias de vídeo,efectos gráficos,efectos del escritorio,velocidad de animación
 X-KDE-Keywords[et]=kwin,aken,haldur,komposiit,komposiitor,efekt,3D efektid,ruumilised efektid,2D efektid,OpenGL,XRender,videoseadistused,graafilised efektid,töölauaefektid,animatsiooni kiirus
+X-KDE-Keywords[eu]=kwin,leiho,kudeatzaile,konposatzaile,efektu,3D efektuak,2D efektuak,OpenGL,XRender,bideo ezarpenak,efektu grafikoak,mahiagaineko efektuak,animazioaren abiadura
 X-KDE-Keywords[fi]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,ikkunointiohjelma,ikkunaohjelma,ikkunanhallinta,tehoste,3D-tehosteet,2D-tehosteet,videoasetukset,graafiset tehosteet,työpöytätehosteet,animointinopeus,animaationopeus
 X-KDE-Keywords[fr]=kwin, fenêtre, gestionnaire, compositeur, effet, effets 3D, effets 2D, OpenGL, XRender, paramètres vidéo, effets graphiques, effets de bureau, vitesse d'animation
 X-KDE-Keywords[gl]=kwin,xanela,xestor,composición,efecto,3D efectos,2D efectos,OpenGL,XRender,configuración da imaxe,efectos gráficos,efectos do escritorio,animation speed,velocidade das animacións
diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop
index b87e4b1d6..b8490f3fa 100644
--- a/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kcmkwin/kwindecoration/kwindecoration.desktop
@@ -85,6 +85,7 @@ Comment[el]=Διαμόρφωση της εμφάνισης και αίσθηση
 Comment[en_GB]=Look and Feel of Window Titles
 Comment[es]=Aspecto visual de los títulos de las ventanas
 Comment[et]=Akna tiitliribade välimus ja tunnetus
+Comment[eu]=Leiho-tituluen itxura eta izaera
 Comment[fi]=Ikkunoiden kehysten ulkoasu
 Comment[fr]=Apparence des titres de fenêtre
 Comment[gl]=Aparencia e o comportamento dos títulos das xanelas
diff --git a/kcmkwin/kwindesktop/desktop.desktop b/kcmkwin/kwindesktop/desktop.desktop
index 9cf00d741..bb0472225 100644
--- a/kcmkwin/kwindesktop/desktop.desktop
+++ b/kcmkwin/kwindesktop/desktop.desktop
@@ -87,6 +87,7 @@ Comment[el]=Περιήγηση, αριθμός και διάταξη εικον
 Comment[en_GB]=Navigation, Number and Layout of Virtual Desktops
 Comment[es]=Navegación, número y disposición de los escritorios virtuales
 Comment[et]=Virtuaalsete töölaudade vahel liikumine, nende arv ja paigutus
+Comment[eu]=Nabigazioa, alegiazko mahaigainen kopurua eta antolamendua
 Comment[fi]=Virtuaalityöpöytien vaihtaminen, määrä ja asettelu
 Comment[fr]=Navigation, nombre et disposition des bureaux virtuels
 Comment[gl]=Navegación, cantidade e disposición dos escritorios virtuais
diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop
index eecd28375..55bf79a21 100644
--- a/kcmkwin/kwinoptions/kwinactions.desktop
+++ b/kcmkwin/kwinoptions/kwinactions.desktop
@@ -112,6 +112,7 @@ Comment[el]=Ενέργειες ποντικιού στα παράθυρα
 Comment[en_GB]=Mouse Actions on Windows
 Comment[es]=Acciones del ratón sobre las ventanas
 Comment[et]=Hiiretoimingud akendes
+Comment[eu]=Sagu-ekintzak leihoetan
 Comment[fi]=Ikkunoiden hiiritoiminnot
 Comment[fr]=Actions de souris sur les fenêtres
 Comment[gl]=Accións do rato nas xanelas
diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop
index 056529386..6e311b2d6 100644
--- a/kcmkwin/kwinoptions/kwinadvanced.desktop
+++ b/kcmkwin/kwinoptions/kwinadvanced.desktop
@@ -111,6 +111,7 @@ Comment[el]=Διαμόρφωση προχωρημένων χαρακτηριστ
 Comment[en_GB]=Advanced Window Management Features
 Comment[es]=Funciones avanzadas del gestor de ventanas
 Comment[et]=Muud aknahalduse omadused
+Comment[eu]=Leiho kudeaketaren ezaugarri aurreratuak
 Comment[fi]=Ikkunoinnin lisäominaisuudet
 Comment[fr]=Fonctionnalités de gestion avancée des fenêtres
 Comment[gl]=Funcionalidades avanzadas da xestión de xanelas
diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop
index 0a7d4f8f1..7a7bec034 100644
--- a/kcmkwin/kwinoptions/kwinfocus.desktop
+++ b/kcmkwin/kwinoptions/kwinfocus.desktop
@@ -108,6 +108,7 @@ Comment[el]=Πολιτική ενεργού παραθύρου
 Comment[en_GB]=Active Window Policy
 Comment[es]=Política de la ventana activa
 Comment[et]=Aktiivse akna reegel
+Comment[eu]=Leiho aktiboentzako politika
 Comment[fi]=Aktiivisen ikkunan valintatapa
 Comment[fr]=Politique pour les fenêtres actives
 Comment[gl]=Política da xanela activa
diff --git a/kcmkwin/kwinoptions/kwinmoving.desktop b/kcmkwin/kwinoptions/kwinmoving.desktop
index 2ad966330..08748a6ca 100644
--- a/kcmkwin/kwinoptions/kwinmoving.desktop
+++ b/kcmkwin/kwinoptions/kwinmoving.desktop
@@ -31,7 +31,7 @@ Name[en_GB]=Moving
 Name[eo]=Movanta
 Name[es]=Moviendo
 Name[et]=Liigutamine
-Name[eu]=Lekuz aldatzen
+Name[eu]=Mugitzea
 Name[fa]=حرکت
 Name[fi]=Siirtäminen
 Name[fr]=Déplacement
@@ -110,6 +110,7 @@ Comment[el]=Μετακίνηση παραθύρου
 Comment[en_GB]=Window Moving
 Comment[es]=Movimiento de ventanas
 Comment[et]=Akna liigutamine
+Comment[eu]=Leihoak mugitzea
 Comment[fi]=Ikkunoiden siirtäminen
 Comment[fr]=Déplacement des fenêtres
 Comment[gl]=Movemento da xanela
diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop
index 86ab1dfbd..20d29d9f0 100644
--- a/kcmkwin/kwinoptions/kwinoptions.desktop
+++ b/kcmkwin/kwinoptions/kwinoptions.desktop
@@ -113,6 +113,7 @@ Comment[el]=Ενέργειες και συμπεριφορά παραθύρου
 Comment[en_GB]=Window Actions and Behaviour
 Comment[es]=Acciones y comportamiento de las ventanas
 Comment[et]=Akende toimingud ja käitumine
+Comment[eu]=Leihoen ekintzak eta portaera
 Comment[fi]=Ikkunoiden toiminnot ja toiminta
 Comment[fr]=Actions et comportement des fenêtres
 Comment[gl]=Comportamento e accións das xanelas
@@ -155,6 +156,7 @@ X-KDE-Keywords[el]=εστίαση,τοποθέτηση,συμπεριφορά π
 X-KDE-Keywords[en_GB]=focus,placement,window behaviour,window actions,animation,raise,auto raise,windows,frame,titlebar,doubleclick
 X-KDE-Keywords[es]=foco,posicionamiento,comportamiento de las ventanas,acciones de las ventanas,animación,elevación,autoelevación,ventanas,marco,barra de título,doble clic
 X-KDE-Keywords[et]=fookus,asetus,paigutus,akende käitumine,aknatoimingud,animeerimine,animatsioon,esiletoomine,automaatne esiletoomine,aknad,raam,tiitliriba,topeltklõps
+X-KDE-Keywords[eu]=foku,kokaleku,leihoen portaera,leiho-ekintzak,animazio,igo,automatikoki igo,leihoak,marko,titulu-barra,klik bikoitz
 X-KDE-Keywords[fi]=kohdistus,sijoittelu,sijoitus,ikkunoiden toiminta,ikkunoiden toiminnot,animaatio,nosta,automaattinen nosto,ikkunat,kehys,otsikkopalkki,kaksoisnapsautus,tuplanapsautus,kaksoisklikkaus,tuplaklikkaus
 X-KDE-Keywords[fr]=focus, placement, comportement de la fenêtre, actions sur les fenêtres, animation, agrandissement, agrandissement automatique, fenêtres, cadre, barre de titre, double clic
 X-KDE-Keywords[gl]=foco,posicionamento,comportamento das xanelas,accións das xanelas, animación,xanelas,moldura,barra de título,marco
diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop
index b6a598f7a..84d2774dd 100644
--- a/kcmkwin/kwinrules/kwinrules.desktop
+++ b/kcmkwin/kwinrules/kwinrules.desktop
@@ -86,6 +86,7 @@ Comment[el]=Συμπεριφορά ανεξάρτητου παραθύρου
 Comment[en_GB]=Individual Window Behaviour
 Comment[es]=Comportamiento de las ventanas individuales
 Comment[et]=Konkreetse akna käitumine
+Comment[eu]=Leihoen banakako portaera
 Comment[fi]=Yksittäisten ikkunoiden toiminta
 Comment[fr]=Comportement individuel des fenêtres
 Comment[gl]=Comportamento individual das xanelas
diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
index 286f66107..7ab5dc9c9 100644
--- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
+++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
@@ -93,6 +93,7 @@ Comment[el]=Ενεργές γωνίες και άκρα οθόνης
 Comment[en_GB]=Active Screen Corners and Edges
 Comment[es]=Esquinas y bordes de la pantalla activa
 Comment[et]=Aktiivsed ekraani nurgad ja servad
+Comment[eu]=Pantaila aktiboaren izkinak eta ertzak
 Comment[fi]=Näytön kulmien ja reunojen toiminnot
 Comment[fr]=Bords et coins actifs de l'écran
 Comment[gl]=Bordos e esquinas activos da pantalla
@@ -133,6 +134,7 @@ X-KDE-Keywords[el]=kwin,παράθυρο,διαχειριστής,εφέ,άκρ
 X-KDE-Keywords[en_GB]=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximise windows,tile windows,side of screen,screen behaviour,switch desktop,virtual desktop,screen corners
 X-KDE-Keywords[es]=kwin,ventana,gestor,efecto,esquina,borde,acción,cambiar,escritorio,bordes de pantalla de kwin,bordes del escritorio,bordes de la pantalla,maximizar ventanas,ventanas en mosaico,lado de la pantalla,comportamiento de la pantalla,cambiar escritorio,escritorio virtual,esquinas de la pantalla
 X-KDE-Keywords[et]=kwin,aken,haldur,efekt.nurk,serv,piire,toiming,lülitamine,töölaud,kwini ekraani servad,töölaua servad,ekraani servad,akende maksimeerimine,akende paanimine,ekraani äär,ekraani käitumine,töölaua lülitamine,virtuaalne töölaud,ekraani nurgad
+X-KDE-Keywords[eu]=kwin,leiho,kudeatzaile,efektu,izkin,ertz,ekintza,aldatu,mahaigain,kwin pantailaren ertzak,mahaigainaren ertzak,pantailen ertzak,maximizatu leihoak,lauzatu leihoak,leihoaren alboa,pantailaren portaera,aldatu mahaigaina,mahaigain birtuala,alegiazko mahaigaina,pantailaren izkinak
 X-KDE-Keywords[fi]=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximize windows,tile windows,side of screen,screen behavior,switch desktop,virtual desktop,screen corners,ikkunamanageri,ikkunointiohjelma,tehoste,kulma,reuna,vaihda,vaihto,työpöytä,näytön reunat,työpöydän reunat,suurenna ikkuna,kasaa ikkunat,näytön toiminta,vaihda työpöytää,virtuaalityöpöytä,näytön reunat
 X-KDE-Keywords[fr]=kwin, fenêtre, gestionnaire, effet, bord, coin, bordure, action, bascule, bureau, bords de l'écran kwin, bords du bureau, bords de l'écran, maximisation des fenêtres, mosaïque de fenêtres, cotés de l'écran, comportement de l'écran, changement de bureau, bureaux virtuels, coins de l'écran
 X-KDE-Keywords[gl]=kwin,xanela,xestor,efecto,esquina,beira,bordo,contorno,acción,trocar,escritorio,contorno do escritorio,maximizar xanelas,escritorio virtual,esquinas da pantalla
diff --git a/kcmkwin/kwintabbox/kwintabbox.desktop b/kcmkwin/kwintabbox/kwintabbox.desktop
index 5d2e9e73c..cf5350f83 100644
--- a/kcmkwin/kwintabbox/kwintabbox.desktop
+++ b/kcmkwin/kwintabbox/kwintabbox.desktop
@@ -83,6 +83,7 @@ Comment[el]=Περιήγηση στα παράθυρα
 Comment[en_GB]=Navigation Through Windows
 Comment[es]=Navegación a través de las ventanas
 Comment[et]=Akende vahel liikumine
+Comment[eu]=Leihoen artean nabigatu
 Comment[fi]=Ikkunoiden välillä siirtyminen
 Comment[fr]=Navigation dans les fenêtres
 Comment[gl]=Navegación polas xanelas
diff --git a/scripts/enforcedeco/metadata.desktop b/scripts/enforcedeco/metadata.desktop
index a8c743d34..50bc6e657 100644
--- a/scripts/enforcedeco/metadata.desktop
+++ b/scripts/enforcedeco/metadata.desktop
@@ -10,6 +10,7 @@ Name[el]=Εξαναγκασμός διακοσμήσεων παραθύρου σ
 Name[en_GB]=Enforces Window Decorations on GTK+ window
 Name[es]=Fuerza decoraciones en las ventanas de GTK+
 Name[et]=Akna dekoratsioonide kehtestamine GTK+ aknas
+Name[eu]=GTK+ leihoengan leiho-apaingarriak behartzen ditu
 Name[fi]=Pakottaa ikkunoiden kehykset GTK+-ikkunoille
 Name[fr]=Forcer les décorations de fenêtres avec les fenêtres GTK+
 Name[gl]=Aplica a decoración ás xanelas de GTK+
@@ -51,6 +52,7 @@ Comment[el]=Διόρθωση λειτουργικών ελαττωμάτων σ
 Comment[en_GB]=Fixes functional deficits for client side decorated windows.
 Comment[es]=Fija deficiencias funcionales en ventanas decoradas en el lado cliente.
 Comment[et]=Kliendipoolsete dekoratsioonidega akende funktsionaalsete puudujääkide parandamine.
+Comment[eu]=Gabezia funtzionala konpontzen die bezeroen aldean apaindutako leihoei
 Comment[fi]=Korjaa asiakkaan kehystämien ikkunoiden toiminnallisia puutteita.
 Comment[fr]=Corrige les défaillances des fenêtres avec décorations gérées par le client.
 Comment[gl]=Soluciona problemas funcionais de xanelas decoradas no lado do cliente.
diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop
index 89eb7be4f..52a8db8dc 100644
--- a/scripts/minimizeall/metadata.desktop
+++ b/scripts/minimizeall/metadata.desktop
@@ -9,6 +9,7 @@ Name[el]=ΕλαχιστοποίησηΌλων
 Name[en_GB]=MinimiseAll
 Name[es]=Maximizar todo
 Name[et]=Kõigi minimeerimine
+Name[eu]=Minimizatu guztiak
 Name[fi]=Pienennä kaikki
 Name[fr]=Tout réduire
 Name[gl]=Minimizalo todo
@@ -45,6 +46,7 @@ Comment[el]=Προσθήκη συντόμευσης για την ελαχιστ
 Comment[en_GB]=Adds a shortcut to minimise all windows or unminimise all such way minimised windows
 Comment[es]=Añade un acceso rápido para minimizar todas la ventanas o restaurar todas las minimizadas de este modo
 Comment[et]=Kiirtoimingu lisamine kõigi akende minimeerimiseks või sel moel minimeeritud akende suuruse taastamiseks
+Comment[eu]=Erantsi lasterbide bat leiho guztiak minimizatzeko edo hala dauden leiho guztiak leheneratzeko
 Comment[fi]=Lisää pikanäppäimen, joka pienentää kaikki ikkunat tai palauttaa kaikki samalla tavalla pienennetyt ikkunat
 Comment[fr]=Ajoute un raccourci pour réduire toutes les fenêtres ou afficher toutes les fenêtres réduites
 Comment[gl]=Engade un atallo para minimizar todas as xanelas e restauralas de novo.

commit 23e500a27324bebb82fd0f5567e8b70ebffb97b1
Author: l10n daemon script <scripty@kde.org>
Date:   Mon Dec 5 05:13:10 2016 +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/effects/cube/cubeslide_config.desktop b/effects/cube/cubeslide_config.desktop
index 6224970a5..2b9b54f71 100644
--- a/effects/cube/cubeslide_config.desktop
+++ b/effects/cube/cubeslide_config.desktop
@@ -50,7 +50,7 @@ Name[nds]=Animeert Wörpel-Schriefdisch
 Name[nl]=Animatie met bureaubladkubus
 Name[nn]=Kubeskifte av skrivebord
 Name[pa]=ਡੈਸਕਟਾਪ ਘਣ ਐਨੀਮੇਸ਼ਨ
-Name[pl]=Animacja sześcianu pulpitu
+Name[pl]=Animacja sześcianu pulpitów
 Name[pt]=Animação do Cubo de Ecrãs
 Name[pt_BR]=Animação do cubo de áreas de trabalho
 Name[ro]=Animație Cub de birou
diff --git a/effects/fadedesktop/package/metadata.desktop b/effects/fadedesktop/package/metadata.desktop
index be482d776..a426a9afc 100644
--- a/effects/fadedesktop/package/metadata.desktop
+++ b/effects/fadedesktop/package/metadata.desktop
@@ -110,7 +110,7 @@ Comment[nds]=Bi't Wesseln de Schriefdischen överenanner blennen
 Comment[nl]=Laat virtuele bureaubladen vervagen en opkomen bij het wisselen
 Comment[nn]=Ton inn og ut ved veksling mellom virtuelle skrivebord
 Comment[pa]=ਜਦੋਂ ਵੁਰਚੁਅਲ ਡੈਸਕਟਾਪ ਵਿੱਚ ਬਦਲਣਾ ਹੋਵੇ ਤਾਂ ਉਹਨਾਂ ਨੂੰ ਫਿੱਕਾ ਕਰੋ
-Comment[pl]=Przenikanie wirtualnych pulpitów podczas przełączania między nimi
+Comment[pl]=Przenikanie wirtualnych pulpitów przy przełączaniu między nimi
 Comment[pt]=Desvanece entre os ecrãs virtuais, ao circular entre eles
 Comment[pt_BR]=Desaparece entre as áreas de trabalho virtuais, ao alternar entre elas
 Comment[ro]=Estompare între birourile virtuale la comutarea între ele

commit ae5df024b1d047b0afb704f87f8ffdf48c1224e6
Author: l10n daemon script <scripty@kde.org>
Date:   Fri Dec 2 05:50:58 2016 +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/plugins/platforms/drm/drm.json b/plugins/platforms/drm/drm.json
index cd75cb94d..4e977602f 100644
--- a/plugins/platforms/drm/drm.json
+++ b/plugins/platforms/drm/drm.json
@@ -44,4 +44,4 @@
         "Name[x-test]": "xxdrmxx"
     }, 
     "input": false
-}
\ No newline at end of file
+}
diff --git a/plugins/platforms/fbdev/fbdev.json b/plugins/platforms/fbdev/fbdev.json
index 103a7cc53..275f25216 100644
--- a/plugins/platforms/fbdev/fbdev.json
+++ b/plugins/platforms/fbdev/fbdev.json
@@ -49,4 +49,4 @@
         "Name[zh_TW]": "影格緩衝區(framebuffer)"
     }, 
     "input": false
-}
\ No newline at end of file
+}
diff --git a/plugins/platforms/hwcomposer/hwcomposer.json b/plugins/platforms/hwcomposer/hwcomposer.json
index 445940533..22e284cb0 100644
--- a/plugins/platforms/hwcomposer/hwcomposer.json
+++ b/plugins/platforms/hwcomposer/hwcomposer.json
@@ -40,4 +40,4 @@
         "Name[x-test]": "xxhwcomposerxx"
     }, 
     "input": false
-}
\ No newline at end of file
+}
diff --git a/plugins/platforms/virtual/virtual.json b/plugins/platforms/virtual/virtual.json
index d55b5af49..7589c8f46 100644
--- a/plugins/platforms/virtual/virtual.json
+++ b/plugins/platforms/virtual/virtual.json
@@ -50,4 +50,4 @@
         "Name[zh_TW]": "虛擬"
     }, 
     "input": true
-}
\ No newline at end of file
+}
diff --git a/plugins/platforms/wayland/wayland.json b/plugins/platforms/wayland/wayland.json
index b927cceb6..656dee225 100644
--- a/plugins/platforms/wayland/wayland.json
+++ b/plugins/platforms/wayland/wayland.json
@@ -42,4 +42,4 @@
         "Name[x-test]": "xxwaylandxx"
     }, 
     "input": true
-}
\ No newline at end of file
+}
diff --git a/plugins/platforms/x11/standalone/x11.json b/plugins/platforms/x11/standalone/x11.json
index 61bddb023..c5de0da90 100644
--- a/plugins/platforms/x11/standalone/x11.json
+++ b/plugins/platforms/x11/standalone/x11.json
@@ -50,4 +50,4 @@
         "Name[x-test]": "xxx11-standalonexx"
     }, 
     "input": true
-}
\ No newline at end of file
+}
diff --git a/plugins/platforms/x11/windowed/x11.json b/plugins/platforms/x11/windowed/x11.json
index a26285f3c..fbaa5fdb1 100644
--- a/plugins/platforms/x11/windowed/x11.json
+++ b/plugins/platforms/x11/windowed/x11.json
@@ -44,4 +44,4 @@
         "Name[x-test]": "xxx11xx"
     }, 
     "input": true
-}
\ No newline at end of file
+}

commit d0e0f6c88cdd032d3bdb9dc7b0c85902fb3d859a
Author: David Edmundson <kde@davidedmundson.co.uk>
Date:   Mon Nov 28 07:49:41 2016 +0000

    Align configure button consistently across delegates
    
    Summary:
    Currently the configure button is aligned to the win decoration in the
    background. This is bound to 40 - the inactive decorations shadow.
    
    This means the configure button ends up in different places across each
    item,
    looking a bit weird and potentially not even on top of the right
    delegate.
    
    This patch aligns the configure button relative to the overall delegate
    so that it's in the same place on every item
    
    Test Plan: Looked at KCM
    
    Reviewers: #plasma
    
    Subscribers: plasma-devel, kwin
    
    Tags: #kwin
    
    Differential Revision: https://phabricator.kde.org/D3526
    
    BUG: 372685

diff --git a/kcmkwin/kwindecoration/qml/Previews.qml b/kcmkwin/kwindecoration/qml/Previews.qml
index fe4c5b327..be8036c32 100644
--- a/kcmkwin/kwindecoration/qml/Previews.qml
+++ b/kcmkwin/kwindecoration/qml/Previews.qml
@@ -107,8 +107,9 @@ ScrollView {
                     Button {
                         id: configureButton
                         anchors {
-                            left: inactivePreview.left
-                            bottom: inactivePreview.bottom
+                            left: parent.left
+                            bottom: parent.bottom
+                            margins: 20
                         }
                         enabled: model["configureable"]
                         iconName: "configure"

commit 47a7f24ed56adf41e4c468d99fd54538357db3b8
Author: l10n daemon script <scripty@kde.org>
Date:   Fri Nov 25 06:39:44 2016 +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/effects/morphingpopups/package/metadata.desktop b/effects/morphingpopups/package/metadata.desktop
index 6cb0d690d..a51fd3edb 100644
--- a/effects/morphingpopups/package/metadata.desktop
+++ b/effects/morphingpopups/package/metadata.desktop
@@ -7,6 +7,7 @@ Comment[en_GB]=Cross fade animation when Tooltips or Notifications change their
 Comment[es]=Animación de transición suave cuando las ayudas emergentes o las notificaciones cambian su geometría
 Comment[et]=Animatsioon hääbumisega, kui kohtspikrid või märguanded muudavad geomeetriat
 Comment[fi]=Häivytysanimaatio työkaluvihjeiden tai ilmoitusten koon muuttuessa
+Comment[fr]=Animation de fondu quand les infobulles ou les notifications changent de forme
 Comment[gl]=Usar unha animación de esvaemento cando a xeometría das mensaxes emerxentes de axuda ou notificación cambia.
 Comment[he]=משנה את גודל החלונית הקופצת בצורה חלקה (שעוברים בין חלוניות)
 Comment[it]=Animazione in dissolvenza quando i suggerimenti e le notifiche cambiano la loro geometria
@@ -38,6 +39,7 @@ Name[en_GB]=Morphing popups
 Name[es]=Transformación de ventanas emergentes
 Name[et]=Moonduvad hüpikdialoogid
 Name[fi]=Ponnahdusikkunoiden muodonmuutos
+Name[fr]=Fondu des menus surgissants
 Name[gl]=Xanelas emerxentes cambiantes
 Name[it]=Finestre a comparsa che si trasformano
 Name[ko]=변형되는 팝업
diff --git a/effects/thumbnailaside/thumbnailaside_config.desktop b/effects/thumbnailaside/thumbnailaside_config.desktop
index ff8f2da35..7de68871c 100644
--- a/effects/thumbnailaside/thumbnailaside_config.desktop
+++ b/effects/thumbnailaside/thumbnailaside_config.desktop
@@ -24,7 +24,7 @@ Name[es]=Miniaturas laterales
 Name[et]=Pisipildid kõrval
 Name[eu]=Koadro txikiak alboan
 Name[fi]=Esikatselukuva vieressä
-Name[fr]=Aperçu sur le côté
+Name[fr]=Vignettes sur le côté
 Name[fy]=Miniatuer der neist
 Name[ga]=Thumbnail Aside
 Name[gl]=Miniatura a un lado
diff --git a/kcmkwin/kwincompositing/kcmkwineffects.desktop b/kcmkwin/kwincompositing/kcmkwineffects.desktop
index 8ce38398b..a5683b999 100644
--- a/kcmkwin/kwincompositing/kcmkwineffects.desktop
+++ b/kcmkwin/kwincompositing/kcmkwineffects.desktop
@@ -113,6 +113,7 @@ X-KDE-Keywords[en_GB]=kwin,window,manager,effect,3D effects,2D effects,graphical
 X-KDE-Keywords[es]=kwin,ventana,gestor,efecto,efectos 3D,efectos 2D,efectos gráficos,efectos del escritorio,animaciones,animaciones diversas,efectos de la gestión de ventanas,efecto de cambio de ventana,efecto de cambio de escritorio,animaciones,animaciones del escritorio,controladores,preferencias del controlador,renderización,renderizar,efecto de inversión,efecto de espejo,efecto de lupa,efecto auxiliar de instantánea,efecto de seguimiento del ratón,efecto de ampliación,efecto borroso,efecto de explosión,efecto de desvanecimiento,efecto de desvanecimiento del escritorio,efecto de romper en pedazos,efecto de planeo,efecto de resaltar ventanas,efecto de inicio de sesión,efecto de final de sesión,efecto de lámpara mágica,efecto de animación al minimizar,efecto de marcas del ratón,efecto de escalado,efecto de captura de pantalla,efecto de hoja,efecto de deslizamiento,efecto de ventanas emergentes deslizantes,efecto de miniaturas de la barra de tareas,efecto de miniaturas laterales,transparencia,efecto de transparencia,efecto de geometría de las ventanas,efecto de ventanas gelatinosas,efecto de notificación de inicio,efecto de padre de la ventana,efecto de oscurecer inactiva,efecto de oscurecer la pantalla,efecto atrás,efectos atractivos,efecto de mostrar FPS,efecto de mostrar pintura,efecto de selección de ventana en caja,efecto de selección de ventana en modo carátula,efecto de cubo del escritorio,efecto de animación del cubo del escritorio,efecto de rejilla del escritorio,efecto de selección de ventana en modo cascada,efecto de contorno,efecto de presentación de ventanas,efecto de cambiar tamaño de las ventanas
 X-KDE-Keywords[et]=kwin,aken,hakdur,efekt,3D efektid,ruumilised efektid,2D efektid,graafikaefektid,töölauaefektid,animatsioonid,eri animatsioonid,aknahaldusefektid,akna lülitamise efekt,töölaua lülitamise efekt,animatsioonid,töölauaanimatsioonid,draiverid,draiveri seadistused,renderdamine,renderdus,inverteerimisefekt,pikksilmaefekt,suurendusklaasiefekt,tõmbe abistaja efekt,hiire jälgimise efekt,suurendusefekt,vidinavaate efekt,plahvatuseefekt,hääbumisefekt,töölaua kadumise efekt,lagunemise efekt,liuglemisefekt,akna esiletõstmise efekt,sisselogimisefekt,väljalogimisefekt,maagilise laterna efekt,minimeerimisanimatsiooni efekt,hiirega tähistamise efekt,skaleerimisefekt,ekraanipildi efekt,leheefekt,slaidiefekt,liuglevate hüpikakende efekt,tegumiriba pisipiltide efekt,kõrvalasuvate pisipiltide efekt,läbipaistvus,läbipaistvuseefekt,akende geomeetria efekt,vonklevate akende efekt,käivitamise tagasiside efekt,dialoogi eellase efekt,tuhmi mitteaktiivse efekt,tuhmi ekraani efekt,tagasiliugumise efekt,silmarõõm,FPS-i näitamise efekt,joonistamise näitamise efekt,kastina lülitamise efekt,vaiplülitamise efekt,töölauakuubiku efekt, töölauakuubiku animatsiooni efekt,töölauavõrgustiku efekt,pööramisega lülitamise efekt,kontuuriefekt,aktiivsete akende efekt, akende suuruse muutmise efekt
 X-KDE-Keywords[fi]=kwin,ikkuna,ohjelma,ikkunointi,ikkunointiohjelma,ikkunanhallinta,tehoste,3D-tehosteet,2D-tehosteet,3U-tehosteet,2U-tehosteet,graafiset tehosteet,työpöytätehosteet,animaatiot,animoinnit,useita animaatioita,eri animaatiot,ikkunanhallintatehosteet,ikkunan vaihtotehoste,työpöydän vaihtotehoste,animaatiot,animoinnit,työpöytäanimaatiot,ajurit,ajuriasetukset,piirtojärjestelmä,renderöijä,renderoija,piirtäminen,renderöinti,renderointi,käänteisten värien tehoste,suurennuslasitehoste,pikaopastajatehoste,hiiren jäljitystehoste,zoomaustehoste,sumennustehoste,räjähdystehoste,häivtytystehoste,työpöydän häivytystehoste,hajoamistehoste,ikkunaliukutehoste,ikkunan korostustehoste,sisäänkirjautumistehosteuloskirjautumistehoste,taikalampputehoste,pienennysanimaatiotehoste,hiiren jäljet -tehoste,skaalaustehoste,kuvankaappaustehoste,arkkitehoste,liu’utustehoste,liukuvat ponnahdusikkunat -tehoste,tehtäväpalkin esikatselukuvat -tehoste,esikatselukuva vieressä -tehoste,läpikuultavuus,läpinäkyvyys,läpikuultavuustehoste,läpinäkyvyystehoste,ikkunan mitat -tehoste,heiluvat ikkunat -tehoste,käynnistymisen ilmaisemisen tehoste,isäikkunatehoste,passiivisen himmennystehoste,näytön himmennystehoste,taakse liu’utus -tehoste,silmäkarkki,karkki,FPS-näyttötehoste,näytä FPS -tehoste,piirtämisen näyttämistehoste,laatikkovaihtajatehoste,levykansivaihtajatehoste,työpöytäkuutiotehoste,työpöytäkuutioanimaatiotehoste,työpöydän ruudukko -tehoste,kääntövaihtajatehoste,ääriviivatehoste,ikkunoiden esittämistehoste,ikkunan koon muuttamistehoste,window,manager,compositing,effect,3D effects,2D effects,video settings,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,animation speed,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,explosion effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window effect,login effect,logout effect,magic lamp effect,minimize animation effect,mouse mark effect,scale in effect,screenshot effect,sheet effect,slide effect,sliding popups effect,taskbar thumbnails effect,thumbnail aside effect,translucency,translucency effect,transparency,window geometry effect,wobbly windows effect,startup feedback effect,dialog parent effect,dim inactive effect,dim screen effect,slide back effect,eye candy,candy,show FPS effect,show paint effect,box switch effect,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,outline effect,present windows effect,resize window effect
+X-KDE-Keywords[fr]=kwin, fenêtre, gestionnaire, effet, effets 3D, effets 2D, effets graphiques, effets de bureau, animations, animations variés, effets de gestion des fenêtres, effets de changement de fenêtre, effets de changement de bureau, animations, animation du bureau, pilotes, paramètres du pilote, rendu, rendre, effet d'inversion, effet de verre, effet de loupe, effet d'aide au positionnement, effet de repérage de la souris, effet de zoom,effet de flou, effet du tableau de bord, effet d'explosion, effet de fondu, effet de fondu du bureau, effet d'effondrement, effet de glissement, effet de mise en valeur de la fenêtre, effet de connexion, effet de déconnexion, effet de lampe magique, effet de minimisation de l'application, effet de marque de la souris, effet de gradation, effet de capture d'écran, effet de feuille, effet de glisse, effet d'annotations glissantes, effet d'aperçu de la barre de tâche, effet d'aperçu sur le coté,translucidité, effet de translucidité, transparence, effet de géométrie de la fenêtre, effet de fenêtre en gélatine, effet du témoin de démarrage, effet de dialogue parent, effet d'obscurcissement de fenêtre inactive, effet d'obscurcissement du bureau, effet de glissement en arrière, confort visuel, beauté, effet d'affichage du FPS, effet d'affichage des zones peintes, effet de défilement dans une boîte, effet de défilement circulaire, effet de bureaux en cube, effet d'animation de cube de bureaux, effet de bureaux en grille, effet d'empilement en perspective, effet d'esquisse, effet de présentation des fenêtres, effet de redimensionnement des fenêtres
 X-KDE-Keywords[gl]=kwin,window,xanela,manager,xestor,effect,efecto,3D effects,efectos 3D,2D effects,efectos 2D,configuración de vídeo,graphical effects,efectos gráficos,efectos visuais,desktop effects,efectos de escritorio,animations,animacións,various animations,animacións diversas,varias animacións,animacións variadas,window management effects,efectos de xestión de xanelas,window switching effect,efecto de cambio de xanela,desktop switching effect,efecto de cambio de escritorio,animations,animacións,desktop animations,animacións de escritorio,animacións dos escritorios,animacións do escritorio,drivers,controlador,controladores,driver settings,configuración dos controladores,configuración do controlador,rendering,renderizado,renderizamento,render,renderizar,invert effect,inverter un efecto,inverter efecto,reverter un efecto,reverter efecto,looking glass effect,efecto de lupa,efecto lupa,magnifier effect,snap helper effect,track mouse effect,efecto de seguir o rato,efecto de seguimento do rato,zoom effect,efecto de ampliación,blur effect,efecto borroso,explosion effect,efecto de explosión,fade effect,efecto de esvaer,fade desktop effect,efecto de esvaer o escritorio,fall apart effect,efecto de destrución,glide effect,efecto de brillo,highlight window effect,efecto de resaltar a xanela,efecto de salientar a xanela,login effect,efecto de acceder,logout effect,efecto de saír,magic lamp effect,efecto de lámpada máxica,minimize animation effect,efecto de minimizar,mouse mark effect,efecto de marca co rato,scale in effect,efecto de achegar,efecto de escalar,screenshot effect,efecto de captura,sheet effect,efecto de folla,slide effect,efecto de dispositiva,sliding popups effect,taskbar thumbnails effect,efecto de miniaturas,thumbnail aside effect,translucency,transparencia,translucidez,translucency effect,efecto de translucidez,efecto de transparencia,transparency,transparencia,window geometry effect,efecto de xeometría da xanela,efecto de xeometría das xanelas,wobbly windows effect,efecto de xanelas a tremer,startup feedback effect,dialog parent effect,efecto do pai do diálogo,dim inactive effect,dim screen effect,efecto de escurecer,slide back effect,eye candy,candy,show FPS effect,efecto de mostrar os FPS,show paint effect,box switch effect,cover switch effect,desktop cube effect,efecto de cubo de escritorio,efecto do cubo de escritorio,efecto de cubo do escritorio,desktop cube animation effect,desktop grid effect,efecto de grade de escritorios,efecto de grella de escritorios,flip switch effect,efecto de interruptor,outline effect,efecto de contorno,present windows effect,resize window effect,efecto de cambio de tamaño das xanelas
 X-KDE-Keywords[it]=kwin,finestra,gestore,effetto,effetti 3D,effetti 2D,effetti grafici,effetti del desktop,animazioni,animazioni varie, effetti del gestore delle finestre,effetto dello scambiafinestre,effetto dello scambiatore di desktop,animazioni,animazioni del desktop,driver,impostazioni driver,rendering,render,effetto invertito,effetto vetro,effetto lente,effetto snap helper,effetto evidenzia mouse,effetto ingrandimento, effetto sfocatura,effetto esplosione,effetto dissolvenza,effetto dissolvenza desktop,effetto caduta,effetto planatura,effetto evidenziazione finestra,effetto schermata di accesso, effetto disconnessione,effetto lampada magica,effetto animazione di minimizzazione,effetto tracciatura mouse, effetto scalatura,effetto schermata,effetto foglio,effetto diapositiva,effetto scivolamento,effetto miniature nella barra delle applicazioni,effetto miniatura su un lato,translucenza,effetto translucenza, trasparenza,effetto geometria finestra,effetto finestre tremolanti,effetto segnale di avvio,effetto finestra madre,effetto oscura finestra inattiva,effetto oscura schermo,effetto scivola all'indietro,gradevole,effetto gradevole,effetto mostra FPS,effetto ridisegno,effetto scambio cubi,effetto scambio copertina,effetto cubi del desktop,effetto animazione cubi del desktop,effetto griglia desktop,effetto scambiatore con inversione,effetto riquadro,effetto finestra presente,effetto ridimensionamento finestra
 X-KDE-Keywords[ko]=kwin,window,manager,effect,3D effects,2D effects,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,dashboard effect,explosion effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window effect,login effect,logout effect,magic lamp effect,minimize animation effect,mouse mark effect,scale in effect,screenshot effect,sheet effect,slide effect,sliding popups effect,taskbar thumbnails effect,thumbnail aside effect,translucency,translucency effect,transparency,window geometry effect,wobbly windows effect,startup feedback effect,dialog parent effect,dim inactive effect,dim screen effect,slide back effect,eye candy,candy,show FPS effect,show paint effect,box switch effect,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,outline effect,present windows effect,resize window effect,창,관리자,효과,3D 효과,2D 효과,그래픽 효과,데스크톱 효과,애니메이션,창 관리자,창 관리자 효과,데스크톱 전환,데스크톱 전환 효과,드라이버,드라이버 설정,렌더링,렌더링 설정,애니메이션 속도,투명 유리 효과,확대 축소 효과,흐림 효과,대시보드 효과,폭발 효과,페이드 효과,로그인 효과,창 강조 효과,글라이드 효과,로그아웃 효과,램프 효과,시트 효과,최소화 효과,최대화 효과,팝업 효과
diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop
index 0005c403f..cb3c19372 100644
--- a/kcmkwin/kwincompositing/kwincompositing.desktop
+++ b/kcmkwin/kwincompositing/kwincompositing.desktop
@@ -68,7 +68,7 @@ Comment[en_GB]=Compositor Settings for Desktop Effects
 Comment[es]=Configurar las preferencias del compositor para los efectos del escritorio
 Comment[et]=Komposiitori seadistused töölauaefektide tarbeks
 Comment[fi]=Koostimen asetukset työpöytätehosteita varten
-Comment[fr]=Paramétrage du compositeur pour les effets du bureau
+Comment[fr]=Paramétrage du compositeur pour les effets de bureau
 Comment[gl]=Configuración do compositor para os efectos de escritorio
 Comment[hu]=A kompozitor beállításai az asztali effektusokhoz
 Comment[ia]=Preferentias de compositor pro le effectos de scriptorio
@@ -107,6 +107,7 @@ X-KDE-Keywords[en_GB]=kwin,window,manager,compositing,effect,3D effects,2D effec
 X-KDE-Keywords[es]=kwin,ventana,gestor,composición,efecto,efectos 3D,efectos 2D,OpenGL,XRender,preferencias de vídeo,efectos gráficos,efectos del escritorio,velocidad de animación
 X-KDE-Keywords[et]=kwin,aken,haldur,komposiit,komposiitor,efekt,3D efektid,ruumilised efektid,2D efektid,OpenGL,XRender,videoseadistused,graafilised efektid,töölauaefektid,animatsiooni kiirus
 X-KDE-Keywords[fi]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,ikkunointiohjelma,ikkunaohjelma,ikkunanhallinta,tehoste,3D-tehosteet,2D-tehosteet,videoasetukset,graafiset tehosteet,työpöytätehosteet,animointinopeus,animaationopeus
+X-KDE-Keywords[fr]=kwin, fenêtre, gestionnaire, compositeur, effet, effets 3D, effets 2D, OpenGL, XRender, paramètres vidéo, effets graphiques, effets de bureau, vitesse d'animation
 X-KDE-Keywords[gl]=kwin,xanela,xestor,composición,efecto,3D efectos,2D efectos,OpenGL,XRender,configuración da imaxe,efectos gráficos,efectos do escritorio,animation speed,velocidade das animacións
 X-KDE-Keywords[it]=kwin,finestra,gestore,composizione,effetto,effetti 3D,effetti 2D,OpenGL,XRender,impostazioni video,effetti grafici,effetti del desktop,velocità delle animazioni
 X-KDE-Keywords[ko]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,animation speed,3D 효과,2D 효과,비디오 설정,그래픽 설정,그래픽 효과,데스크톱 효과,애니메이션 속도
diff -Nru --exclude po kwin-5.8.4/autotests/integration/modifier_only_shortcut_test.cpp kwin-5.8.6/autotests/integration/modifier_only_shortcut_test.cpp
--- kwin-5.8.4/autotests/integration/modifier_only_shortcut_test.cpp	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/autotests/integration/modifier_only_shortcut_test.cpp	2017-02-21 13:04:59.000000000 +0100
@@ -20,6 +20,7 @@
 #include "kwin_wayland_test.h"
 #include "cursor.h"
 #include "input.h"
+#include "keyboard_input.h"
 #include "platform.h"
 #include "screens.h"
 #include "wayland_server.h"
@@ -250,7 +251,7 @@
 void ModifierOnlyShortcutTest::testCapsLock()
 {
     // this test verifies that Capslock does not trigger the shift shortcut
-    // and that the shift modifier on capslock does not trigger either
+    // but other shortcuts still trigger even when Capslock is on
     Target target;
     QSignalSpy triggeredSpy(&target, &Target::shortcutTriggered);
     QVERIFY(triggeredSpy.isValid());
@@ -277,17 +278,38 @@
     QCOMPARE(triggeredSpy.count(), 1);
 
     // currently caps lock is on
-    // shift is ignored
+    // shift still triggers
     kwinApp()->platform()->keyboardKeyPressed(modifier, timestamp++);
     kwinApp()->platform()->keyboardKeyReleased(modifier, timestamp++);
     QCOMPARE(input()->keyboardModifiers(), Qt::ShiftModifier);
-    QCOMPARE(triggeredSpy.count(), 1);
+    QCOMPARE(triggeredSpy.count(), 2);
+
+    // meta should also trigger
+    group.writeEntry("Meta", QStringList{s_serviceName, s_path, s_serviceName, QStringLiteral("shortcut")});
+    group.writeEntry("Alt", QStringList());
+    group.writeEntry("Shift", QStringList{});
+    group.writeEntry("Control", QStringList());
+    group.sync();
+    workspace()->slotReconfigure();
+    kwinApp()->platform()->keyboardKeyPressed(KEY_LEFTMETA, timestamp++);
+    QCOMPARE(input()->keyboardModifiers(), Qt::ShiftModifier | Qt::MetaModifier);
+    QCOMPARE(input()->keyboard()->xkb()->modifiersRelevantForGlobalShortcuts(), Qt::MetaModifier);
+    kwinApp()->platform()->keyboardKeyReleased(KEY_LEFTMETA, timestamp++);
+    QCOMPARE(triggeredSpy.count(), 3);
+
+    // set back to shift to ensure we don't trigger with capslock
+    group.writeEntry("Meta", QStringList());
+    group.writeEntry("Alt", QStringList());
+    group.writeEntry("Shift", QStringList{s_serviceName, s_path, s_serviceName, QStringLiteral("shortcut")});
+    group.writeEntry("Control", QStringList());
+    group.sync();
+    workspace()->slotReconfigure();
 
     // release caps lock
     kwinApp()->platform()->keyboardKeyPressed(KEY_CAPSLOCK, timestamp++);
     kwinApp()->platform()->keyboardKeyReleased(KEY_CAPSLOCK, timestamp++);
     QCOMPARE(input()->keyboardModifiers(), Qt::NoModifier);
-    QCOMPARE(triggeredSpy.count(), 1);
+    QCOMPARE(triggeredSpy.count(), 3);
 }
 
 void ModifierOnlyShortcutTest::testGlobalShortcutsDisabled_data()
diff -Nru --exclude po kwin-5.8.4/CMakeLists.txt kwin-5.8.6/CMakeLists.txt
--- kwin-5.8.4/CMakeLists.txt	2016-11-22 11:17:37.000000000 +0100
+++ kwin-5.8.6/CMakeLists.txt	2017-02-21 13:06:00.000000000 +0100
@@ -1,5 +1,5 @@
 project(KWIN)
-set(PROJECT_VERSION "5.8.4")
+set(PROJECT_VERSION "5.8.6")
 set(PROJECT_VERSION_MAJOR 5)
 
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
@@ -120,7 +120,7 @@
                        TYPE REQUIRED
                        PURPOSE "For screenlocker integration in kwin_wayland")
 
-find_package(Breeze ${PROJECT_VERSION} CONFIG)
+find_package(Breeze 5.8.0 CONFIG)
 set_package_properties(Breeze PROPERTIES
                        TYPE OPTIONAL
                        PURPOSE "For setting the default window decoration plugin")
diff -Nru --exclude po kwin-5.8.4/debian/changelog kwin-5.8.6/debian/changelog
--- kwin-5.8.4/debian/changelog	2016-11-23 18:36:53.000000000 +0100
+++ kwin-5.8.6/debian/changelog	2017-03-24 14:38:54.000000000 +0100
@@ -1,3 +1,27 @@
+kwin (4:5.8.6-1) unstable; urgency=medium
+
+  * New upstream release (5.8.6) (Closes: 846508)
+
+ -- Maximiliano Curia <maxy@debian.org>  Fri, 24 Mar 2017 14:38:54 +0100
+
+kwin (4:5.8.5-2) unstable; urgency=medium
+
+  * Be more strict about runtime dependencies.
+    Thanks to Ben Longbons for reporting (Closes: 848523)
+  * Drop forced qtwayland runtime dependency.
+    Thanks to Martin Graesslin for reporting (Closes: 855410)
+  * Update kwin-wayland description about being a preview release.
+    Thanks to Ben Longbons for reporting (Closes: 848524)
+
+ -- Maximiliano Curia <maxy@debian.org>  Sat, 18 Feb 2017 10:42:33 +0100
+
+kwin (4:5.8.5-1) experimental; urgency=medium
+
+  * New upstream release (5.8.5).
+  * Update symbols files.
+
+ -- Maximiliano Curia <maxy@debian.org>  Fri, 30 Dec 2016 18:46:18 +0100
+
 kwin (4:5.8.4-1) unstable; urgency=medium
 
   [ Maximiliano Curia ]
diff -Nru --exclude po kwin-5.8.4/debian/control kwin-5.8.6/debian/control
--- kwin-5.8.4/debian/control	2016-11-23 18:36:53.000000000 +0100
+++ kwin-5.8.6/debian/control	2017-03-24 14:38:54.000000000 +0100
@@ -127,7 +127,11 @@
 
 Package: kwin-x11
 Architecture: any
-Depends: kwin-common (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: kwin-common (= ${binary:Version}),
+         libkwinglutils9 (= ${binary:Version}),
+         libkwinxrenderutils9 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: kde-window-manager (<< 4:5), kwin-addons (<< 4:5.8)
 Replaces: kde-window-manager (<< 4:5)
 Provides: kwin, x-window-manager
@@ -146,13 +150,12 @@
 Architecture: any
 Depends: kwayland-integration,
          kwin-common (= ${binary:Version}),
-         kwin-wayland-backend-drm (= ${binary:Version}) | kwin-wayland-backend,
-         qtwayland5,
+         kwin-wayland-backend-drm (= ${binary:Version}) | kwin-wayland-backend-fbdev (= ${binary:Version}) | kwin-wayland-backend-x11 (= ${binary:Version}) | kwin-wayland-backend-virtual (= ${binary:Version}) | kwin-wayland-backend-wayland (= ${binary:Version}),
          xwayland,
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: kwin
-Description: KDE window manager, wayland version
+Description: KDE window manager, wayland version, PREVIEW release
  KWin (pronounced as one syllable "kwin") is the window
  manager for the KDE Plasma Desktop. It gives you complete
  control over your windows, making sure they're not in the way
@@ -161,7 +164,9 @@
  like close, maximize and minimize. It also handles placing
  of windows and switching between them.
  .
- This package is part of the KDE base workspace module.
+ This package provides the wayland version, which is still a work in progress
+ project, and is available as a PREVIEW release. Don't expect the same
+ stability as with the x11 version.
 Breaks: plasma-workspace-wayland (<< 4:5.8)
 
 Package: libkwin4-effect-builtins1
diff -Nru --exclude po kwin-5.8.4/debian/libkwineffects9.symbols kwin-5.8.6/debian/libkwineffects9.symbols
--- kwin-5.8.4/debian/libkwineffects9.symbols	2016-11-23 18:36:53.000000000 +0100
+++ kwin-5.8.6/debian/libkwineffects9.symbols	2017-03-24 14:38:54.000000000 +0100
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:5.8.0 amd64
+# SymbolsHelper-Confirmed: 4:5.8.5 amd64
 libkwineffects.so.9 libkwineffects9 #MINVER#
  _ZN4KWin11EffectFrame15enableCrossFadeEb@Base 4:5.1.95+git20150122
  _ZN4KWin11EffectFrame20setCrossFadeProgressEd@Base 4:5.1.95+git20150122
@@ -62,6 +62,7 @@
  _ZN4KWin14EffectsHandler15windowActivatedEPNS_12EffectWindowE@Base 4:5.1.95+git20150122
  _ZN4KWin14EffectsHandler15windowMinimizedEPNS_12EffectWindowE@Base 4:5.1.95+git20150122
  _ZN4KWin14EffectsHandler16staticMetaObjectE@Base 4:5.1.95+git20150122
+ _ZN4KWin14EffectsHandler17windowDataChangedEPNS_12EffectWindowEi@Base 4:5.8.5
  _ZN4KWin14EffectsHandler17windowUnminimizedEPNS_12EffectWindowE@Base 4:5.1.95+git20150122
  _ZN4KWin14EffectsHandler18cursorShapeChangedEv@Base 4:5.3.0
  _ZN4KWin14EffectsHandler20numberScreensChangedEv@Base 4:5.1.95+git20150122
diff -Nru --exclude po kwin-5.8.4/effects/cube/cube_config.cpp kwin-5.8.6/effects/cube/cube_config.cpp
--- kwin-5.8.4/effects/cube/cube_config.cpp	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/effects/cube/cube_config.cpp	2017-02-21 13:04:59.000000000 +0100
@@ -82,6 +82,7 @@
 
     m_ui->editor->addCollection(m_actionCollection);
 
+    capsSelectionChanged();
     connect(m_ui->kcfg_Caps, SIGNAL(stateChanged(int)), this, SLOT(capsSelectionChanged()));
     m_ui->kcfg_Wallpaper->setFilter(QStringLiteral("*.png *.jpeg *.jpg "));
     addConfig(CubeConfig::self(), m_ui);
diff -Nru --exclude po kwin-5.8.4/effects/cube/cubeslide_config.desktop kwin-5.8.6/effects/cube/cubeslide_config.desktop
--- kwin-5.8.4/effects/cube/cubeslide_config.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/effects/cube/cubeslide_config.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -50,7 +50,7 @@
 Name[nl]=Animatie met bureaubladkubus
 Name[nn]=Kubeskifte av skrivebord
 Name[pa]=ਡੈਸਕਟਾਪ ਘਣ ਐਨੀਮੇਸ਼ਨ
-Name[pl]=Animacja sześcianu pulpitu
+Name[pl]=Animacja sześcianu pulpitów
 Name[pt]=Animação do Cubo de Ecrãs
 Name[pt_BR]=Animação do cubo de áreas de trabalho
 Name[ro]=Animație Cub de birou
diff -Nru --exclude po kwin-5.8.4/effects/eyeonscreen/package/metadata.desktop kwin-5.8.6/effects/eyeonscreen/package/metadata.desktop
--- kwin-5.8.4/effects/eyeonscreen/package/metadata.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/effects/eyeonscreen/package/metadata.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -3,9 +3,11 @@
 Name[ca]=Ull a la pantalla
 Name[ca@valencia]=Ull a la pantalla
 Name[da]=øjet på skærmen
+Name[de]=Ansicht der Arbeitsfläche
 Name[en_GB]=eye On Screen
 Name[es]=Ojo a la pantalla
 Name[et]=eye On Screen
+Name[eu]=begia pantailan
 Name[fi]=eye On Screen
 Name[fr]=Jeter un oeil sur le bureau
 Name[gl]=Ollo na pantalla
@@ -38,9 +40,11 @@
 Comment[ca]=Enganxa les finestres a l'escriptori per a mostrar la darrera. Això podria recordar-vos quelcom.
 Comment[ca@valencia]=Enganxa les finestres a l'escriptori per a mostrar la darrera. Això podria recordar-vos quelcom.
 Comment[da]=Sug vinduer ind i skrivebordet for at vise dette. Måske minder det dig om noget.
+Comment[de]=Saugt Fenster in die Arbeitsfläche, um sie anzuzeigen.
 Comment[en_GB]=Suck windows into desktop to show the latter. This might remind you of something.
 Comment[es]=Succionar las ventanas en el escritorio para mostrarlo. Esto debe recordarle algo.
 Comment[et]=Imeb aknad töölauda ja näitab viimast. See võib midagi meenutada ...
+Comment[eu]=Xurgatu mahaigaineko leihoak, berau erakusteko. Honek zer edo zer gogoraraziko diezazuke.
 Comment[fi]=Imee ikkunat työpöytään näyttääkseen sen. Tämä saattaa muistuttaa sinua jostain.
 Comment[fr]=Aspire toutes les fenêtres pour afficher le bureau.
 Comment[gl]=Que o escritorio succione as xanelas para mostrarse. Isto pode que lle recorde a algo.
diff -Nru --exclude po kwin-5.8.4/effects/fade/package/metadata.desktop kwin-5.8.6/effects/fade/package/metadata.desktop
--- kwin-5.8.4/effects/fade/package/metadata.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/effects/fade/package/metadata.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -17,7 +17,7 @@
 Name[eo]=Dissolvi
 Name[es]=Fundido
 Name[et]=Hääbumine
-Name[eu]=Iraungi
+Name[eu]=Desagertzea
 Name[fa]=محو کردن
 Name[fi]=Häivytys
 Name[fr]=Fondu
diff -Nru --exclude po kwin-5.8.4/effects/fadedesktop/package/metadata.desktop kwin-5.8.6/effects/fadedesktop/package/metadata.desktop
--- kwin-5.8.4/effects/fadedesktop/package/metadata.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/effects/fadedesktop/package/metadata.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -15,7 +15,7 @@
 Name[eo]=Labortablo Dissolvo  
 Name[es]=Difuminar escritorio
 Name[et]=Töölaua hääbumine
-Name[eu]=Iraungi mahaigaina
+Name[eu]=Mahaigaina desagertzea
 Name[fi]=Työpöydän häivytys
 Name[fr]=Effectue un fondu du bureau
 Name[fy]=Buroblêd ferfagje
@@ -83,7 +83,7 @@
 Comment[eo]=Disvolvi inter virtualaj labortabloj kiam ŝaltas inter ili.
 Comment[es]=Difumina al cambiar entre escritorios virtuales
 Comment[et]=Hääbumisefekt ühelt virtuaalselt töölaualt teisele lülitudes
-Comment[eu]=Uneko mahaigaina iraungitzen du mahagain batetik bestera aldatzean
+Comment[eu]=Uneko mahaigaina desagerrarazi mahagain batetik bestera aldatzean
 Comment[fi]=Häivytys virtuaalityöpöytien välillä niitä vaihdettaessa
 Comment[fr]=Effectue un fondu entre les bureaux virtuels lors des changements de bureau
 Comment[fy]=By it wikseljen tusken firuele buroblêden in ferfaging dwaan
@@ -110,7 +110,7 @@
 Comment[nl]=Laat virtuele bureaubladen vervagen en opkomen bij het wisselen
 Comment[nn]=Ton inn og ut ved veksling mellom virtuelle skrivebord
 Comment[pa]=ਜਦੋਂ ਵੁਰਚੁਅਲ ਡੈਸਕਟਾਪ ਵਿੱਚ ਬਦਲਣਾ ਹੋਵੇ ਤਾਂ ਉਹਨਾਂ ਨੂੰ ਫਿੱਕਾ ਕਰੋ
-Comment[pl]=Przenikanie wirtualnych pulpitów podczas przełączania między nimi
+Comment[pl]=Przenikanie wirtualnych pulpitów przy przełączaniu między nimi
 Comment[pt]=Desvanece entre os ecrãs virtuais, ao circular entre eles
 Comment[pt_BR]=Desaparece entre as áreas de trabalho virtuais, ao alternar entre elas
 Comment[ro]=Estompare între birourile virtuale la comutarea între ele
diff -Nru --exclude po kwin-5.8.4/effects/flipswitch/flipswitch_config.desktop kwin-5.8.6/effects/flipswitch/flipswitch_config.desktop
--- kwin-5.8.4/effects/flipswitch/flipswitch_config.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/effects/flipswitch/flipswitch_config.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -19,7 +19,7 @@
 Name[eo]=Turna ŝanĝilo
 Name[es]=Selección de ventana en modo cascada
 Name[et]=Aknalehitseja
-Name[eu]=Leiho pila
+Name[eu]=Biratze aldaketa
 Name[fi]=Kääntövaihtaja
 Name[fr]=Empilement en perspective
 Name[fy]=Flip wiksel
diff -Nru --exclude po kwin-5.8.4/effects/glide/glide_config.desktop kwin-5.8.6/effects/glide/glide_config.desktop
--- kwin-5.8.4/effects/glide/glide_config.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/effects/glide/glide_config.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -18,7 +18,7 @@
 Name[en_GB]=Glide
 Name[es]=Glide
 Name[et]=Liuglemine
-Name[eu]=Lerratu
+Name[eu]=Irristatzea
 Name[fi]=Ikkunaliuku
 Name[fr]=Glisser
 Name[ga]=Sleamhnaigh
diff -Nru --exclude po kwin-5.8.4/effects/maximize/package/metadata.desktop kwin-5.8.6/effects/maximize/package/metadata.desktop
--- kwin-5.8.4/effects/maximize/package/metadata.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/effects/maximize/package/metadata.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -10,7 +10,7 @@
 Comment[en_GB]=Animation for a window going to maximise/restore from maximise
 Comment[es]=Animación para una ventana que se va a maximizar o restaurar de una maximización
 Comment[et]=Maksimeeritava või maksimeeritust taastatava akna animatsioon
-Comment[eu]=Leihoa maximizatzera doanerako/maximizatutik leheneratzen denerako animazioa
+Comment[eu]=Leihoa maximizatzera/maximizatutik leheneratzera doanerako animazioa
 Comment[fi]=Animointi ikkunalle, joka suurennetaan tai palautetaan suurennuksesta
 Comment[fr]=Animation pour une fenêtre passant d'un état maximisé vers un état maximisé / restauré
 Comment[gl]=Animación das xanelas que se maximizan ou restauran maximizadas
diff -Nru --exclude po kwin-5.8.4/effects/morphingpopups/package/metadata.desktop kwin-5.8.6/effects/morphingpopups/package/metadata.desktop
--- kwin-5.8.4/effects/morphingpopups/package/metadata.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/effects/morphingpopups/package/metadata.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -3,10 +3,13 @@
 Comment[ca]=Animació d'esvaïment creuat quan els consells d'eines o les notificacions canvien la seva geometria
 Comment[ca@valencia]=Animació d'esvaïment creuat quan els consells d'eines o les notificacions canvien la seua geometria
 Comment[da]=Crossfade-animation når værktøjstip og bekendtgørelser skifter geometry
+Comment[de]=Überblendende Animationen, wenn Kurzinfos oder Benachrichtigungen ihre Geometrie ändern
 Comment[en_GB]=Cross fade animation when Tooltips or Notifications change their geometry
 Comment[es]=Animación de transición suave cuando las ayudas emergentes o las notificaciones cambian su geometría
 Comment[et]=Animatsioon hääbumisega, kui kohtspikrid või märguanded muudavad geomeetriat
+Comment[eu]=Desagertze gurutzatua tresnen argibideek edo jakinarazpenek geometria aldatzen dutenean
 Comment[fi]=Häivytysanimaatio työkaluvihjeiden tai ilmoitusten koon muuttuessa
+Comment[fr]=Animation de fondu quand les infobulles ou les notifications changent de forme
 Comment[gl]=Usar unha animación de esvaemento cando a xeometría das mensaxes emerxentes de axuda ou notificación cambia.
 Comment[he]=משנה את גודל החלונית הקופצת בצורה חלקה (שעוברים בין חלוניות)
 Comment[it]=Animazione in dissolvenza quando i suggerimenti e le notifiche cambiano la loro geometria
@@ -34,10 +37,13 @@
 Name[ca]=Missatges emergents en metamorfosi
 Name[ca@valencia]=Missatges emergents en metamorfosi
 Name[da]=Sammensmeltende pop-op'er
+Name[de]=Verformende Aufklappfenster
 Name[en_GB]=Morphing popups
 Name[es]=Transformación de ventanas emergentes
 Name[et]=Moonduvad hüpikdialoogid
+Name[eu]=Eraldatzen diren gainerakorrak
 Name[fi]=Ponnahdusikkunoiden muodonmuutos
+Name[fr]=Fondu des menus surgissants
 Name[gl]=Xanelas emerxentes cambiantes
 Name[it]=Finestre a comparsa che si trasformano
 Name[ko]=변형되는 팝업
diff -Nru --exclude po kwin-5.8.4/effects/thumbnailaside/thumbnailaside_config.desktop kwin-5.8.6/effects/thumbnailaside/thumbnailaside_config.desktop
--- kwin-5.8.4/effects/thumbnailaside/thumbnailaside_config.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/effects/thumbnailaside/thumbnailaside_config.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -24,7 +24,7 @@
 Name[et]=Pisipildid kõrval
 Name[eu]=Koadro txikiak alboan
 Name[fi]=Esikatselukuva vieressä
-Name[fr]=Aperçu sur le côté
+Name[fr]=Vignettes sur le côté
 Name[fy]=Miniatuer der neist
 Name[ga]=Thumbnail Aside
 Name[gl]=Miniatura a un lado
diff -Nru --exclude po kwin-5.8.4/effects/windowaperture/package/metadata.desktop kwin-5.8.6/effects/windowaperture/package/metadata.desktop
--- kwin-5.8.4/effects/windowaperture/package/metadata.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/effects/windowaperture/package/metadata.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -9,6 +9,7 @@
 Name[en_GB]=Window Aperture
 Name[es]=Apertura de ventanas
 Name[et]=Aknaava
+Name[eu]=Leihoa irekitzea
 Name[fi]=Ikkunoiden siirto näytön kulmiin
 Name[fr]=Ouverture de la fenêtre
 Name[gl]=Apertura das xanelas
@@ -45,6 +46,7 @@
 Comment[en_GB]=Move window into the corners while showing desktop
 Comment[es]=Mover las ventanas a las esquinas cuando se muestra el escritorio
 Comment[et]=Akende viimine nurkadesse töölauda näidates
+Comment[eu]=Mugitu leihoa izkinetan mahaigana erakutsi bitartean
 Comment[fi]=Siirrä ikkunat näytön kulmiin työpöydän näyttämisen ajaksi
 Comment[fr]=Déplace les fenêtres dans les coins en affichant le bureau
 Comment[gl]=Mover a xanela ás esquinas mentres se mostra o escritorio.
diff -Nru --exclude po kwin-5.8.4/kcmkwin/kwincompositing/kcmkwineffects.desktop kwin-5.8.6/kcmkwin/kwincompositing/kcmkwineffects.desktop
--- kwin-5.8.4/kcmkwin/kwincompositing/kcmkwineffects.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/kcmkwin/kwincompositing/kcmkwineffects.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -24,6 +24,7 @@
 Name[en_GB]=Desktop Effects
 Name[es]=Efectos del escritorio
 Name[et]=Töölauaefektid
+Name[eu]=Mahaigaineko efektuak
 Name[fi]=Työpöytätehosteet
 Name[fr]=Effets de bureau
 Name[gl]=Efectos do escritorio
@@ -70,6 +71,7 @@
 Comment[en_GB]=Desktop Effects
 Comment[es]=Efectos del escritorio
 Comment[et]=Töölauaefektid
+Comment[eu]=Mahaigaineko efektuak
 Comment[fi]=Työpöytätehosteet
 Comment[fr]=Effets de bureau
 Comment[gl]=Efectos do escritorio
@@ -113,6 +115,7 @@
 X-KDE-Keywords[es]=kwin,ventana,gestor,efecto,efectos 3D,efectos 2D,efectos gráficos,efectos del escritorio,animaciones,animaciones diversas,efectos de la gestión de ventanas,efecto de cambio de ventana,efecto de cambio de escritorio,animaciones,animaciones del escritorio,controladores,preferencias del controlador,renderización,renderizar,efecto de inversión,efecto de espejo,efecto de lupa,efecto auxiliar de instantánea,efecto de seguimiento del ratón,efecto de ampliación,efecto borroso,efecto de explosión,efecto de desvanecimiento,efecto de desvanecimiento del escritorio,efecto de romper en pedazos,efecto de planeo,efecto de resaltar ventanas,efecto de inicio de sesión,efecto de final de sesión,efecto de lámpara mágica,efecto de animación al minimizar,efecto de marcas del ratón,efecto de escalado,efecto de captura de pantalla,efecto de hoja,efecto de deslizamiento,efecto de ventanas emergentes deslizantes,efecto de miniaturas de la barra de tareas,efecto de miniaturas laterales,transparencia,efecto de transparencia,efecto de geometría de las ventanas,efecto de ventanas gelatinosas,efecto de notificación de inicio,efecto de padre de la ventana,efecto de oscurecer inactiva,efecto de oscurecer la pantalla,efecto atrás,efectos atractivos,efecto de mostrar FPS,efecto de mostrar pintura,efecto de selección de ventana en caja,efecto de selección de ventana en modo carátula,efecto de cubo del escritorio,efecto de animación del cubo del escritorio,efecto de rejilla del escritorio,efecto de selección de ventana en modo cascada,efecto de contorno,efecto de presentación de ventanas,efecto de cambiar tamaño de las ventanas
 X-KDE-Keywords[et]=kwin,aken,hakdur,efekt,3D efektid,ruumilised efektid,2D efektid,graafikaefektid,töölauaefektid,animatsioonid,eri animatsioonid,aknahaldusefektid,akna lülitamise efekt,töölaua lülitamise efekt,animatsioonid,töölauaanimatsioonid,draiverid,draiveri seadistused,renderdamine,renderdus,inverteerimisefekt,pikksilmaefekt,suurendusklaasiefekt,tõmbe abistaja efekt,hiire jälgimise efekt,suurendusefekt,vidinavaate efekt,plahvatuseefekt,hääbumisefekt,töölaua kadumise efekt,lagunemise efekt,liuglemisefekt,akna esiletõstmise efekt,sisselogimisefekt,väljalogimisefekt,maagilise laterna efekt,minimeerimisanimatsiooni efekt,hiirega tähistamise efekt,skaleerimisefekt,ekraanipildi efekt,leheefekt,slaidiefekt,liuglevate hüpikakende efekt,tegumiriba pisipiltide efekt,kõrvalasuvate pisipiltide efekt,läbipaistvus,läbipaistvuseefekt,akende geomeetria efekt,vonklevate akende efekt,käivitamise tagasiside efekt,dialoogi eellase efekt,tuhmi mitteaktiivse efekt,tuhmi ekraani efekt,tagasiliugumise efekt,silmarõõm,FPS-i näitamise efekt,joonistamise näitamise efekt,kastina lülitamise efekt,vaiplülitamise efekt,töölauakuubiku efekt, töölauakuubiku animatsiooni efekt,töölauavõrgustiku efekt,pööramisega lülitamise efekt,kontuuriefekt,aktiivsete akende efekt, akende suuruse muutmise efekt
 X-KDE-Keywords[fi]=kwin,ikkuna,ohjelma,ikkunointi,ikkunointiohjelma,ikkunanhallinta,tehoste,3D-tehosteet,2D-tehosteet,3U-tehosteet,2U-tehosteet,graafiset tehosteet,työpöytätehosteet,animaatiot,animoinnit,useita animaatioita,eri animaatiot,ikkunanhallintatehosteet,ikkunan vaihtotehoste,työpöydän vaihtotehoste,animaatiot,animoinnit,työpöytäanimaatiot,ajurit,ajuriasetukset,piirtojärjestelmä,renderöijä,renderoija,piirtäminen,renderöinti,renderointi,käänteisten värien tehoste,suurennuslasitehoste,pikaopastajatehoste,hiiren jäljitystehoste,zoomaustehoste,sumennustehoste,räjähdystehoste,häivtytystehoste,työpöydän häivytystehoste,hajoamistehoste,ikkunaliukutehoste,ikkunan korostustehoste,sisäänkirjautumistehosteuloskirjautumistehoste,taikalampputehoste,pienennysanimaatiotehoste,hiiren jäljet -tehoste,skaalaustehoste,kuvankaappaustehoste,arkkitehoste,liu’utustehoste,liukuvat ponnahdusikkunat -tehoste,tehtäväpalkin esikatselukuvat -tehoste,esikatselukuva vieressä -tehoste,läpikuultavuus,läpinäkyvyys,läpikuultavuustehoste,läpinäkyvyystehoste,ikkunan mitat -tehoste,heiluvat ikkunat -tehoste,käynnistymisen ilmaisemisen tehoste,isäikkunatehoste,passiivisen himmennystehoste,näytön himmennystehoste,taakse liu’utus -tehoste,silmäkarkki,karkki,FPS-näyttötehoste,näytä FPS -tehoste,piirtämisen näyttämistehoste,laatikkovaihtajatehoste,levykansivaihtajatehoste,työpöytäkuutiotehoste,työpöytäkuutioanimaatiotehoste,työpöydän ruudukko -tehoste,kääntövaihtajatehoste,ääriviivatehoste,ikkunoiden esittämistehoste,ikkunan koon muuttamistehoste,window,manager,compositing,effect,3D effects,2D effects,video settings,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,animation speed,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,explosion effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window effect,login effect,logout effect,magic lamp effect,minimize animation effect,mouse mark effect,scale in effect,screenshot effect,sheet effect,slide effect,sliding popups effect,taskbar thumbnails effect,thumbnail aside effect,translucency,translucency effect,transparency,window geometry effect,wobbly windows effect,startup feedback effect,dialog parent effect,dim inactive effect,dim screen effect,slide back effect,eye candy,candy,show FPS effect,show paint effect,box switch effect,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,outline effect,present windows effect,resize window effect
+X-KDE-Keywords[fr]=kwin, fenêtre, gestionnaire, effet, effets 3D, effets 2D, effets graphiques, effets de bureau, animations, animations variés, effets de gestion des fenêtres, effets de changement de fenêtre, effets de changement de bureau, animations, animation du bureau, pilotes, paramètres du pilote, rendu, rendre, effet d'inversion, effet de verre, effet de loupe, effet d'aide au positionnement, effet de repérage de la souris, effet de zoom,effet de flou, effet du tableau de bord, effet d'explosion, effet de fondu, effet de fondu du bureau, effet d'effondrement, effet de glissement, effet de mise en valeur de la fenêtre, effet de connexion, effet de déconnexion, effet de lampe magique, effet de minimisation de l'application, effet de marque de la souris, effet de gradation, effet de capture d'écran, effet de feuille, effet de glisse, effet d'annotations glissantes, effet d'aperçu de la barre de tâche, effet d'aperçu sur le coté,translucidité, effet de translucidité, transparence, effet de géométrie de la fenêtre, effet de fenêtre en gélatine, effet du témoin de démarrage, effet de dialogue parent, effet d'obscurcissement de fenêtre inactive, effet d'obscurcissement du bureau, effet de glissement en arrière, confort visuel, beauté, effet d'affichage du FPS, effet d'affichage des zones peintes, effet de défilement dans une boîte, effet de défilement circulaire, effet de bureaux en cube, effet d'animation de cube de bureaux, effet de bureaux en grille, effet d'empilement en perspective, effet d'esquisse, effet de présentation des fenêtres, effet de redimensionnement des fenêtres
 X-KDE-Keywords[gl]=kwin,window,xanela,manager,xestor,effect,efecto,3D effects,efectos 3D,2D effects,efectos 2D,configuración de vídeo,graphical effects,efectos gráficos,efectos visuais,desktop effects,efectos de escritorio,animations,animacións,various animations,animacións diversas,varias animacións,animacións variadas,window management effects,efectos de xestión de xanelas,window switching effect,efecto de cambio de xanela,desktop switching effect,efecto de cambio de escritorio,animations,animacións,desktop animations,animacións de escritorio,animacións dos escritorios,animacións do escritorio,drivers,controlador,controladores,driver settings,configuración dos controladores,configuración do controlador,rendering,renderizado,renderizamento,render,renderizar,invert effect,inverter un efecto,inverter efecto,reverter un efecto,reverter efecto,looking glass effect,efecto de lupa,efecto lupa,magnifier effect,snap helper effect,track mouse effect,efecto de seguir o rato,efecto de seguimento do rato,zoom effect,efecto de ampliación,blur effect,efecto borroso,explosion effect,efecto de explosión,fade effect,efecto de esvaer,fade desktop effect,efecto de esvaer o escritorio,fall apart effect,efecto de destrución,glide effect,efecto de brillo,highlight window effect,efecto de resaltar a xanela,efecto de salientar a xanela,login effect,efecto de acceder,logout effect,efecto de saír,magic lamp effect,efecto de lámpada máxica,minimize animation effect,efecto de minimizar,mouse mark effect,efecto de marca co rato,scale in effect,efecto de achegar,efecto de escalar,screenshot effect,efecto de captura,sheet effect,efecto de folla,slide effect,efecto de dispositiva,sliding popups effect,taskbar thumbnails effect,efecto de miniaturas,thumbnail aside effect,translucency,transparencia,translucidez,translucency effect,efecto de translucidez,efecto de transparencia,transparency,transparencia,window geometry effect,efecto de xeometría da xanela,efecto de xeometría das xanelas,wobbly windows effect,efecto de xanelas a tremer,startup feedback effect,dialog parent effect,efecto do pai do diálogo,dim inactive effect,dim screen effect,efecto de escurecer,slide back effect,eye candy,candy,show FPS effect,efecto de mostrar os FPS,show paint effect,box switch effect,cover switch effect,desktop cube effect,efecto de cubo de escritorio,efecto do cubo de escritorio,efecto de cubo do escritorio,desktop cube animation effect,desktop grid effect,efecto de grade de escritorios,efecto de grella de escritorios,flip switch effect,efecto de interruptor,outline effect,efecto de contorno,present windows effect,resize window effect,efecto de cambio de tamaño das xanelas
 X-KDE-Keywords[it]=kwin,finestra,gestore,effetto,effetti 3D,effetti 2D,effetti grafici,effetti del desktop,animazioni,animazioni varie, effetti del gestore delle finestre,effetto dello scambiafinestre,effetto dello scambiatore di desktop,animazioni,animazioni del desktop,driver,impostazioni driver,rendering,render,effetto invertito,effetto vetro,effetto lente,effetto snap helper,effetto evidenzia mouse,effetto ingrandimento, effetto sfocatura,effetto esplosione,effetto dissolvenza,effetto dissolvenza desktop,effetto caduta,effetto planatura,effetto evidenziazione finestra,effetto schermata di accesso, effetto disconnessione,effetto lampada magica,effetto animazione di minimizzazione,effetto tracciatura mouse, effetto scalatura,effetto schermata,effetto foglio,effetto diapositiva,effetto scivolamento,effetto miniature nella barra delle applicazioni,effetto miniatura su un lato,translucenza,effetto translucenza, trasparenza,effetto geometria finestra,effetto finestre tremolanti,effetto segnale di avvio,effetto finestra madre,effetto oscura finestra inattiva,effetto oscura schermo,effetto scivola all'indietro,gradevole,effetto gradevole,effetto mostra FPS,effetto ridisegno,effetto scambio cubi,effetto scambio copertina,effetto cubi del desktop,effetto animazione cubi del desktop,effetto griglia desktop,effetto scambiatore con inversione,effetto riquadro,effetto finestra presente,effetto ridimensionamento finestra
 X-KDE-Keywords[ko]=kwin,window,manager,effect,3D effects,2D effects,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,dashboard effect,explosion effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window effect,login effect,logout effect,magic lamp effect,minimize animation effect,mouse mark effect,scale in effect,screenshot effect,sheet effect,slide effect,sliding popups effect,taskbar thumbnails effect,thumbnail aside effect,translucency,translucency effect,transparency,window geometry effect,wobbly windows effect,startup feedback effect,dialog parent effect,dim inactive effect,dim screen effect,slide back effect,eye candy,candy,show FPS effect,show paint effect,box switch effect,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,outline effect,present windows effect,resize window effect,창,관리자,효과,3D 효과,2D 효과,그래픽 효과,데스크톱 효과,애니메이션,창 관리자,창 관리자 효과,데스크톱 전환,데스크톱 전환 효과,드라이버,드라이버 설정,렌더링,렌더링 설정,애니메이션 속도,투명 유리 효과,확대 축소 효과,흐림 효과,대시보드 효과,폭발 효과,페이드 효과,로그인 효과,창 강조 효과,글라이드 효과,로그아웃 효과,램프 효과,시트 효과,최소화 효과,최대화 효과,팝업 효과
diff -Nru --exclude po kwin-5.8.4/kcmkwin/kwincompositing/kwincompositing.desktop kwin-5.8.6/kcmkwin/kwincompositing/kwincompositing.desktop
--- kwin-5.8.4/kcmkwin/kwincompositing/kwincompositing.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/kcmkwin/kwincompositing/kwincompositing.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -24,6 +24,7 @@
 Name[en_GB]=Compositor
 Name[es]=Compositor
 Name[et]=Komposiitor
+Name[eu]=Konposatzailea
 Name[fi]=Koostin
 Name[fr]=Compositeur
 Name[gl]=Compositor
@@ -67,8 +68,9 @@
 Comment[en_GB]=Compositor Settings for Desktop Effects
 Comment[es]=Configurar las preferencias del compositor para los efectos del escritorio
 Comment[et]=Komposiitori seadistused töölauaefektide tarbeks
+Comment[eu]=Konposatzailearen ezarpenak mahaigaineko efektuetarako
 Comment[fi]=Koostimen asetukset työpöytätehosteita varten
-Comment[fr]=Paramétrage du compositeur pour les effets du bureau
+Comment[fr]=Paramétrage du compositeur pour les effets de bureau
 Comment[gl]=Configuración do compositor para os efectos de escritorio
 Comment[hu]=A kompozitor beállításai az asztali effektusokhoz
 Comment[ia]=Preferentias de compositor pro le effectos de scriptorio
@@ -106,7 +108,9 @@
 X-KDE-Keywords[en_GB]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,animation speed
 X-KDE-Keywords[es]=kwin,ventana,gestor,composición,efecto,efectos 3D,efectos 2D,OpenGL,XRender,preferencias de vídeo,efectos gráficos,efectos del escritorio,velocidad de animación
 X-KDE-Keywords[et]=kwin,aken,haldur,komposiit,komposiitor,efekt,3D efektid,ruumilised efektid,2D efektid,OpenGL,XRender,videoseadistused,graafilised efektid,töölauaefektid,animatsiooni kiirus
+X-KDE-Keywords[eu]=kwin,leiho,kudeatzaile,konposatzaile,efektu,3D efektuak,2D efektuak,OpenGL,XRender,bideo ezarpenak,efektu grafikoak,mahiagaineko efektuak,animazioaren abiadura
 X-KDE-Keywords[fi]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,ikkunointiohjelma,ikkunaohjelma,ikkunanhallinta,tehoste,3D-tehosteet,2D-tehosteet,videoasetukset,graafiset tehosteet,työpöytätehosteet,animointinopeus,animaationopeus
+X-KDE-Keywords[fr]=kwin, fenêtre, gestionnaire, compositeur, effet, effets 3D, effets 2D, OpenGL, XRender, paramètres vidéo, effets graphiques, effets de bureau, vitesse d'animation
 X-KDE-Keywords[gl]=kwin,xanela,xestor,composición,efecto,3D efectos,2D efectos,OpenGL,XRender,configuración da imaxe,efectos gráficos,efectos do escritorio,animation speed,velocidade das animacións
 X-KDE-Keywords[it]=kwin,finestra,gestore,composizione,effetto,effetti 3D,effetti 2D,OpenGL,XRender,impostazioni video,effetti grafici,effetti del desktop,velocità delle animazioni
 X-KDE-Keywords[ko]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,animation speed,3D 효과,2D 효과,비디오 설정,그래픽 설정,그래픽 효과,데스크톱 효과,애니메이션 속도
diff -Nru --exclude po kwin-5.8.4/kcmkwin/kwindecoration/kcm.cpp kwin-5.8.6/kcmkwin/kwindecoration/kcm.cpp
--- kwin-5.8.4/kcmkwin/kwindecoration/kcm.cpp	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/kcmkwin/kwindecoration/kcm.cpp	2017-02-21 13:04:59.000000000 +0100
@@ -100,7 +100,10 @@
     m_quickView->rootContext()->setContextProperty(QStringLiteral("decorationsModel"), m_proxyModel);
     updateColors();
     m_quickView->rootContext()->setContextProperty("_borderSizesIndex", 3); // 3 is normal
-    m_quickView->rootContext()->setContextProperty("configurationModule", this);
+    m_quickView->rootContext()->setContextProperty("leftButtons", m_leftButtons);
+    m_quickView->rootContext()->setContextProperty("rightButtons", m_rightButtons);
+    m_quickView->rootContext()->setContextProperty("availableButtons", m_availableButtons);
+
     m_quickView->rootContext()->setContextProperty("titleFont", QFontDatabase::systemFont(QFontDatabase::TitleFont));
     m_quickView->setResizeMode(QQuickView::SizeRootObjectToView);
     m_quickView->setSource(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kwin/kcm_kwindecoration/main.qml"))));
@@ -406,21 +409,6 @@
     delete downloadDialog;
 }
 
-QAbstractItemModel *ConfigurationModule::leftButtons() const
-{
-    return m_leftButtons;
-}
-
-QAbstractItemModel *ConfigurationModule::rightButtons() const
-{
-    return m_rightButtons;
-}
-
-QAbstractItemModel *ConfigurationModule::availableButtons() const
-{
-    return m_availableButtons;
-}
-
 bool ConfigurationModule::eventFilter(QObject *watched, QEvent *e)
 {
     if (watched != m_ui) {
diff -Nru --exclude po kwin-5.8.4/kcmkwin/kwindecoration/kcm.h kwin-5.8.6/kcmkwin/kwindecoration/kcm.h
--- kwin-5.8.4/kcmkwin/kwindecoration/kcm.h	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/kcmkwin/kwindecoration/kcm.h	2017-02-21 13:04:59.000000000 +0100
@@ -47,17 +47,10 @@
 class ConfigurationModule : public KCModule
 {
     Q_OBJECT
-    Q_PROPERTY(QAbstractItemModel* leftButtons READ leftButtons CONSTANT)
-    Q_PROPERTY(QAbstractItemModel* rightButtons READ rightButtons CONSTANT)
-    Q_PROPERTY(QAbstractItemModel* availableButtons READ availableButtons CONSTANT)
 public:
     explicit ConfigurationModule(QWidget *parent = nullptr, const QVariantList &args = QVariantList());
     virtual ~ConfigurationModule();
 
-    QAbstractItemModel *leftButtons() const;
-    QAbstractItemModel *rightButtons() const;
-    QAbstractItemModel *availableButtons() const;
-
     bool eventFilter(QObject *watched, QEvent *e) override;
 
 public Q_SLOTS:
diff -Nru --exclude po kwin-5.8.4/kcmkwin/kwindecoration/kwindecoration.desktop kwin-5.8.6/kcmkwin/kwindecoration/kwindecoration.desktop
--- kwin-5.8.4/kcmkwin/kwindecoration/kwindecoration.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/kcmkwin/kwindecoration/kwindecoration.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -85,6 +85,7 @@
 Comment[en_GB]=Look and Feel of Window Titles
 Comment[es]=Aspecto visual de los títulos de las ventanas
 Comment[et]=Akna tiitliribade välimus ja tunnetus
+Comment[eu]=Leiho-tituluen itxura eta izaera
 Comment[fi]=Ikkunoiden kehysten ulkoasu
 Comment[fr]=Apparence des titres de fenêtre
 Comment[gl]=Aparencia e o comportamento dos títulos das xanelas
diff -Nru --exclude po kwin-5.8.4/kcmkwin/kwindecoration/qml/Buttons.qml kwin-5.8.6/kcmkwin/kwindecoration/qml/Buttons.qml
--- kwin-5.8.4/kcmkwin/kwindecoration/qml/Buttons.qml	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/kcmkwin/kwindecoration/qml/Buttons.qml	2017-02-21 13:04:59.000000000 +0100
@@ -63,7 +63,7 @@
                         id: leftButtonsView
                         anchors.left: parent.left;
                         height: buttonPreviewRow.height
-                        model: configurationModule.leftButtons
+                        model: leftButtons
                         key: "decoButtonLeft"
                     }
                     Item {
@@ -81,7 +81,7 @@
                         id: rightButtonsView
                         anchors.right: parent.right;
                         height: buttonPreviewRow.height
-                        model: configurationModule.rightButtons
+                        model: rightButtons
                         key: "decoButtonRight"
                     }
                     DropArea {
@@ -144,7 +144,7 @@
             GridView {
                 id: availableGrid
                 Layout.fillWidth: true
-                model: configurationModule.availableButtons
+                model: availableButtons
                 interactive: false
                 cellWidth: iconLabel.implicitWidth
                 cellHeight: units.iconSizes.small + iCannotBelieveIDoThis.implicitHeight + 4*units.smallSpacing
diff -Nru --exclude po kwin-5.8.4/kcmkwin/kwindecoration/qml/Previews.qml kwin-5.8.6/kcmkwin/kwindecoration/qml/Previews.qml
--- kwin-5.8.4/kcmkwin/kwindecoration/qml/Previews.qml	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/kcmkwin/kwindecoration/qml/Previews.qml	2017-02-21 13:04:59.000000000 +0100
@@ -107,8 +107,9 @@
                     Button {
                         id: configureButton
                         anchors {
-                            left: inactivePreview.left
-                            bottom: inactivePreview.bottom
+                            left: parent.left
+                            bottom: parent.bottom
+                            margins: 20
                         }
                         enabled: model["configureable"]
                         iconName: "configure"
diff -Nru --exclude po kwin-5.8.4/kcmkwin/kwindesktop/desktop.desktop kwin-5.8.6/kcmkwin/kwindesktop/desktop.desktop
--- kwin-5.8.4/kcmkwin/kwindesktop/desktop.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/kcmkwin/kwindesktop/desktop.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -87,6 +87,7 @@
 Comment[en_GB]=Navigation, Number and Layout of Virtual Desktops
 Comment[es]=Navegación, número y disposición de los escritorios virtuales
 Comment[et]=Virtuaalsete töölaudade vahel liikumine, nende arv ja paigutus
+Comment[eu]=Nabigazioa, alegiazko mahaigainen kopurua eta antolamendua
 Comment[fi]=Virtuaalityöpöytien vaihtaminen, määrä ja asettelu
 Comment[fr]=Navigation, nombre et disposition des bureaux virtuels
 Comment[gl]=Navegación, cantidade e disposición dos escritorios virtuais
diff -Nru --exclude po kwin-5.8.4/kcmkwin/kwinoptions/kwinactions.desktop kwin-5.8.6/kcmkwin/kwinoptions/kwinactions.desktop
--- kwin-5.8.4/kcmkwin/kwinoptions/kwinactions.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/kcmkwin/kwinoptions/kwinactions.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -112,6 +112,7 @@
 Comment[en_GB]=Mouse Actions on Windows
 Comment[es]=Acciones del ratón sobre las ventanas
 Comment[et]=Hiiretoimingud akendes
+Comment[eu]=Sagu-ekintzak leihoetan
 Comment[fi]=Ikkunoiden hiiritoiminnot
 Comment[fr]=Actions de souris sur les fenêtres
 Comment[gl]=Accións do rato nas xanelas
diff -Nru --exclude po kwin-5.8.4/kcmkwin/kwinoptions/kwinadvanced.desktop kwin-5.8.6/kcmkwin/kwinoptions/kwinadvanced.desktop
--- kwin-5.8.4/kcmkwin/kwinoptions/kwinadvanced.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/kcmkwin/kwinoptions/kwinadvanced.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -111,6 +111,7 @@
 Comment[en_GB]=Advanced Window Management Features
 Comment[es]=Funciones avanzadas del gestor de ventanas
 Comment[et]=Muud aknahalduse omadused
+Comment[eu]=Leiho kudeaketaren ezaugarri aurreratuak
 Comment[fi]=Ikkunoinnin lisäominaisuudet
 Comment[fr]=Fonctionnalités de gestion avancée des fenêtres
 Comment[gl]=Funcionalidades avanzadas da xestión de xanelas
diff -Nru --exclude po kwin-5.8.4/kcmkwin/kwinoptions/kwinfocus.desktop kwin-5.8.6/kcmkwin/kwinoptions/kwinfocus.desktop
--- kwin-5.8.4/kcmkwin/kwinoptions/kwinfocus.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/kcmkwin/kwinoptions/kwinfocus.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -108,6 +108,7 @@
 Comment[en_GB]=Active Window Policy
 Comment[es]=Política de la ventana activa
 Comment[et]=Aktiivse akna reegel
+Comment[eu]=Leiho aktiboentzako politika
 Comment[fi]=Aktiivisen ikkunan valintatapa
 Comment[fr]=Politique pour les fenêtres actives
 Comment[gl]=Política da xanela activa
diff -Nru --exclude po kwin-5.8.4/kcmkwin/kwinoptions/kwinmoving.desktop kwin-5.8.6/kcmkwin/kwinoptions/kwinmoving.desktop
--- kwin-5.8.4/kcmkwin/kwinoptions/kwinmoving.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/kcmkwin/kwinoptions/kwinmoving.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -31,7 +31,7 @@
 Name[eo]=Movanta
 Name[es]=Moviendo
 Name[et]=Liigutamine
-Name[eu]=Lekuz aldatzen
+Name[eu]=Mugitzea
 Name[fa]=حرکت
 Name[fi]=Siirtäminen
 Name[fr]=Déplacement
@@ -110,6 +110,7 @@
 Comment[en_GB]=Window Moving
 Comment[es]=Movimiento de ventanas
 Comment[et]=Akna liigutamine
+Comment[eu]=Leihoak mugitzea
 Comment[fi]=Ikkunoiden siirtäminen
 Comment[fr]=Déplacement des fenêtres
 Comment[gl]=Movemento da xanela
diff -Nru --exclude po kwin-5.8.4/kcmkwin/kwinoptions/kwinoptions.desktop kwin-5.8.6/kcmkwin/kwinoptions/kwinoptions.desktop
--- kwin-5.8.4/kcmkwin/kwinoptions/kwinoptions.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/kcmkwin/kwinoptions/kwinoptions.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -113,6 +113,7 @@
 Comment[en_GB]=Window Actions and Behaviour
 Comment[es]=Acciones y comportamiento de las ventanas
 Comment[et]=Akende toimingud ja käitumine
+Comment[eu]=Leihoen ekintzak eta portaera
 Comment[fi]=Ikkunoiden toiminnot ja toiminta
 Comment[fr]=Actions et comportement des fenêtres
 Comment[gl]=Comportamento e accións das xanelas
@@ -155,6 +156,7 @@
 X-KDE-Keywords[en_GB]=focus,placement,window behaviour,window actions,animation,raise,auto raise,windows,frame,titlebar,doubleclick
 X-KDE-Keywords[es]=foco,posicionamiento,comportamiento de las ventanas,acciones de las ventanas,animación,elevación,autoelevación,ventanas,marco,barra de título,doble clic
 X-KDE-Keywords[et]=fookus,asetus,paigutus,akende käitumine,aknatoimingud,animeerimine,animatsioon,esiletoomine,automaatne esiletoomine,aknad,raam,tiitliriba,topeltklõps
+X-KDE-Keywords[eu]=foku,kokaleku,leihoen portaera,leiho-ekintzak,animazio,igo,automatikoki igo,leihoak,marko,titulu-barra,klik bikoitz
 X-KDE-Keywords[fi]=kohdistus,sijoittelu,sijoitus,ikkunoiden toiminta,ikkunoiden toiminnot,animaatio,nosta,automaattinen nosto,ikkunat,kehys,otsikkopalkki,kaksoisnapsautus,tuplanapsautus,kaksoisklikkaus,tuplaklikkaus
 X-KDE-Keywords[fr]=focus, placement, comportement de la fenêtre, actions sur les fenêtres, animation, agrandissement, agrandissement automatique, fenêtres, cadre, barre de titre, double clic
 X-KDE-Keywords[gl]=foco,posicionamento,comportamento das xanelas,accións das xanelas, animación,xanelas,moldura,barra de título,marco
diff -Nru --exclude po kwin-5.8.4/kcmkwin/kwinrules/kwinrules.desktop kwin-5.8.6/kcmkwin/kwinrules/kwinrules.desktop
--- kwin-5.8.4/kcmkwin/kwinrules/kwinrules.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/kcmkwin/kwinrules/kwinrules.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -86,6 +86,7 @@
 Comment[en_GB]=Individual Window Behaviour
 Comment[es]=Comportamiento de las ventanas individuales
 Comment[et]=Konkreetse akna käitumine
+Comment[eu]=Leihoen banakako portaera
 Comment[fi]=Yksittäisten ikkunoiden toiminta
 Comment[fr]=Comportement individuel des fenêtres
 Comment[gl]=Comportamento individual das xanelas
diff -Nru --exclude po kwin-5.8.4/kcmkwin/kwinscreenedges/kwinscreenedges.desktop kwin-5.8.6/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
--- kwin-5.8.4/kcmkwin/kwinscreenedges/kwinscreenedges.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/kcmkwin/kwinscreenedges/kwinscreenedges.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -93,6 +93,7 @@
 Comment[en_GB]=Active Screen Corners and Edges
 Comment[es]=Esquinas y bordes de la pantalla activa
 Comment[et]=Aktiivsed ekraani nurgad ja servad
+Comment[eu]=Pantaila aktiboaren izkinak eta ertzak
 Comment[fi]=Näytön kulmien ja reunojen toiminnot
 Comment[fr]=Bords et coins actifs de l'écran
 Comment[gl]=Bordos e esquinas activos da pantalla
@@ -133,6 +134,7 @@
 X-KDE-Keywords[en_GB]=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximise windows,tile windows,side of screen,screen behaviour,switch desktop,virtual desktop,screen corners
 X-KDE-Keywords[es]=kwin,ventana,gestor,efecto,esquina,borde,acción,cambiar,escritorio,bordes de pantalla de kwin,bordes del escritorio,bordes de la pantalla,maximizar ventanas,ventanas en mosaico,lado de la pantalla,comportamiento de la pantalla,cambiar escritorio,escritorio virtual,esquinas de la pantalla
 X-KDE-Keywords[et]=kwin,aken,haldur,efekt.nurk,serv,piire,toiming,lülitamine,töölaud,kwini ekraani servad,töölaua servad,ekraani servad,akende maksimeerimine,akende paanimine,ekraani äär,ekraani käitumine,töölaua lülitamine,virtuaalne töölaud,ekraani nurgad
+X-KDE-Keywords[eu]=kwin,leiho,kudeatzaile,efektu,izkin,ertz,ekintza,aldatu,mahaigain,kwin pantailaren ertzak,mahaigainaren ertzak,pantailen ertzak,maximizatu leihoak,lauzatu leihoak,leihoaren alboa,pantailaren portaera,aldatu mahaigaina,mahaigain birtuala,alegiazko mahaigaina,pantailaren izkinak
 X-KDE-Keywords[fi]=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximize windows,tile windows,side of screen,screen behavior,switch desktop,virtual desktop,screen corners,ikkunamanageri,ikkunointiohjelma,tehoste,kulma,reuna,vaihda,vaihto,työpöytä,näytön reunat,työpöydän reunat,suurenna ikkuna,kasaa ikkunat,näytön toiminta,vaihda työpöytää,virtuaalityöpöytä,näytön reunat
 X-KDE-Keywords[fr]=kwin, fenêtre, gestionnaire, effet, bord, coin, bordure, action, bascule, bureau, bords de l'écran kwin, bords du bureau, bords de l'écran, maximisation des fenêtres, mosaïque de fenêtres, cotés de l'écran, comportement de l'écran, changement de bureau, bureaux virtuels, coins de l'écran
 X-KDE-Keywords[gl]=kwin,xanela,xestor,efecto,esquina,beira,bordo,contorno,acción,trocar,escritorio,contorno do escritorio,maximizar xanelas,escritorio virtual,esquinas da pantalla
diff -Nru --exclude po kwin-5.8.4/kcmkwin/kwintabbox/kwintabbox.desktop kwin-5.8.6/kcmkwin/kwintabbox/kwintabbox.desktop
--- kwin-5.8.4/kcmkwin/kwintabbox/kwintabbox.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/kcmkwin/kwintabbox/kwintabbox.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -83,6 +83,7 @@
 Comment[en_GB]=Navigation Through Windows
 Comment[es]=Navegación a través de las ventanas
 Comment[et]=Akende vahel liikumine
+Comment[eu]=Leihoen artean nabigatu
 Comment[fi]=Ikkunoiden välillä siirtyminen
 Comment[fr]=Navigation dans les fenêtres
 Comment[gl]=Navegación polas xanelas
diff -Nru --exclude po kwin-5.8.4/keyboard_input.cpp kwin-5.8.6/keyboard_input.cpp
--- kwin-5.8.4/keyboard_input.cpp	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/keyboard_input.cpp	2017-02-21 13:04:59.000000000 +0100
@@ -33,6 +33,7 @@
 #include <KScreenLocker/KsldApp>
 // Frameworks
 #include <KKeyServer>
+#include <KLocalizedString>
 #include <KGlobalAccel>
 // Qt
 #include <QDBusConnection>
@@ -285,7 +286,7 @@
     if (!m_keymap || !m_state) {
         return;
     }
-    const auto oldMods = m_modifiers;
+    const auto oldMods = modifiersRelevantForGlobalShortcuts();
     xkb_state_update_key(m_state, key + 8, static_cast<xkb_key_direction>(state));
     if (state == InputRedirection::KeyboardKeyPressed) {
         const auto sym = toKeysym(key);
@@ -313,14 +314,14 @@
             !ScreenLockerWatcher::self()->isLocked() &&
             oldMods == Qt::NoModifier &&
             m_input->qtButtonStates() == Qt::NoButton) {
-            m_modOnlyShortcut.modifier = Qt::KeyboardModifier(int(m_modifiers));
+            m_modOnlyShortcut.modifier = Qt::KeyboardModifier(int(modifiersRelevantForGlobalShortcuts()));
         } else {
             m_modOnlyShortcut.modifier = Qt::NoModifier;
         }
     } else {
         m_modOnlyShortcut.pressCount--;
         if (m_modOnlyShortcut.pressCount == 0 &&
-            m_modifiers == Qt::NoModifier &&
+            modifiersRelevantForGlobalShortcuts() == Qt::NoModifier &&
             !workspace()->globalShortcutsDisabled()) {
             if (m_modOnlyShortcut.modifier != Qt::NoModifier) {
                 const auto list = options->modifierOnlyDBusShortcut(m_modOnlyShortcut.modifier);
@@ -385,7 +386,7 @@
             QStringLiteral("org.kde.osdService"),
             QStringLiteral("kbdLayoutChanged"));
 
-            msg << QString::fromLocal8Bit(xkb_keymap_layout_get_name(m_keymap, layout));
+            msg << i18nd("xkeyboard-config", xkb_keymap_layout_get_name(m_keymap, layout));
 
             QDBusConnection::sessionBus().asyncCall(msg);
         }
diff -Nru --exclude po kwin-5.8.4/plugins/platforms/drm/drm.json kwin-5.8.6/plugins/platforms/drm/drm.json
--- kwin-5.8.4/plugins/platforms/drm/drm.json	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/plugins/platforms/drm/drm.json	2017-02-21 13:04:59.000000000 +0100
@@ -44,4 +44,4 @@
         "Name[x-test]": "xxdrmxx"
     }, 
     "input": false
-}
\ No newline at end of file
+}
diff -Nru --exclude po kwin-5.8.4/plugins/platforms/fbdev/fbdev.json kwin-5.8.6/plugins/platforms/fbdev/fbdev.json
--- kwin-5.8.4/plugins/platforms/fbdev/fbdev.json	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/plugins/platforms/fbdev/fbdev.json	2017-02-21 13:04:59.000000000 +0100
@@ -49,4 +49,4 @@
         "Name[zh_TW]": "影格緩衝區(framebuffer)"
     }, 
     "input": false
-}
\ No newline at end of file
+}
diff -Nru --exclude po kwin-5.8.4/plugins/platforms/hwcomposer/hwcomposer.json kwin-5.8.6/plugins/platforms/hwcomposer/hwcomposer.json
--- kwin-5.8.4/plugins/platforms/hwcomposer/hwcomposer.json	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/plugins/platforms/hwcomposer/hwcomposer.json	2017-02-21 13:04:59.000000000 +0100
@@ -4,6 +4,7 @@
         "Description[ca@valencia]": "Renderitza mitjançant el «hwcomposer» mitjançant «libhybris».", 
         "Description[ca]": "Renderitza mitjançant el «hwcomposer» mitjançant «libhybris».", 
         "Description[da]": "Rendér igennem hwcomposer igennem libhybris.", 
+        "Description[de]": "In hwcomposer mit libhybris rendern.", 
         "Description[el]": "Αποτύπωση μέσω hwcomposer μέσω libhybris.", 
         "Description[es]": "Renderizar a través «hwcomposer» mediante «libhybris».", 
         "Description[et]": "Renderdamine hwcomposeris libhybrise abil.", 
@@ -40,4 +41,4 @@
         "Name[x-test]": "xxhwcomposerxx"
     }, 
     "input": false
-}
\ No newline at end of file
+}
diff -Nru --exclude po kwin-5.8.4/plugins/platforms/virtual/virtual.json kwin-5.8.6/plugins/platforms/virtual/virtual.json
--- kwin-5.8.4/plugins/platforms/virtual/virtual.json	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/plugins/platforms/virtual/virtual.json	2017-02-21 13:04:59.000000000 +0100
@@ -50,4 +50,4 @@
         "Name[zh_TW]": "虛擬"
     }, 
     "input": true
-}
\ No newline at end of file
+}
diff -Nru --exclude po kwin-5.8.4/plugins/platforms/wayland/wayland.json kwin-5.8.6/plugins/platforms/wayland/wayland.json
--- kwin-5.8.4/plugins/platforms/wayland/wayland.json	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/plugins/platforms/wayland/wayland.json	2017-02-21 13:04:59.000000000 +0100
@@ -4,6 +4,7 @@
         "Description[ca@valencia]": "Renderitza a una finestra imbricada en un compositor Wayland en execució.", 
         "Description[ca]": "Renderitza a una finestra imbricada en un compositor Wayland en execució.", 
         "Description[da]": "Rendér til et indlejret vindue på kørende Wayland-compositor.", 
+        "Description[de]": "In ein eingebettetes Fenster auf dem laufenden Wayland-Kompositor rendern.", 
         "Description[el]": "Αποτύπωση σε εμφωλευμένο παράθυρο κατά την εκτέλεση του συνθέτη Wayland.", 
         "Description[es]": "Renderizar en una ventana anidada en el compositor Wayland en ejecución.", 
         "Description[et]": "Renderdamine töötava Waylandi komposiitori pesastatud aknas.", 
@@ -42,4 +43,4 @@
         "Name[x-test]": "xxwaylandxx"
     }, 
     "input": true
-}
\ No newline at end of file
+}
diff -Nru --exclude po kwin-5.8.4/plugins/platforms/x11/standalone/x11.json kwin-5.8.6/plugins/platforms/x11/standalone/x11.json
--- kwin-5.8.4/plugins/platforms/x11/standalone/x11.json	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/plugins/platforms/x11/standalone/x11.json	2017-02-21 13:04:59.000000000 +0100
@@ -4,6 +4,7 @@
         "Description[ca@valencia]": "Connector de plataforma per una X11 autònoma en el kwin_x11.", 
         "Description[ca]": "Connector de plataforma per una X11 autònoma en el kwin_x11.", 
         "Description[da]": "Platform-plugin til standalone x11 i kwin_x11.", 
+        "Description[de]": "Plattform-Modul für ein selbstständiges X11 in kwin_x11.", 
         "Description[el]": "Πρόσθετο πλατφόρμας για αυτόνομο x11 και kwin_x11.", 
         "Description[es]": "Complemento de Platform para X11 autónomo en kwin_x11.", 
         "Description[et]": "Autonoomse x11 platvormi plugin kwin_x11-s", 
@@ -32,6 +33,7 @@
         "Name": "x11-standalone", 
         "Name[ca@valencia]": "X11-autònoma", 
         "Name[ca]": "X11-autònoma", 
+        "Name[de]": "Selbständiges-x11", 
         "Name[el]": "x11-αυτόνομος", 
         "Name[es]": "x11-autónomo", 
         "Name[gl]": "x11-independente", 
@@ -50,4 +52,4 @@
         "Name[x-test]": "xxx11-standalonexx"
     }, 
     "input": true
-}
\ No newline at end of file
+}
diff -Nru --exclude po kwin-5.8.4/plugins/platforms/x11/windowed/x11.json kwin-5.8.6/plugins/platforms/x11/windowed/x11.json
--- kwin-5.8.4/plugins/platforms/x11/windowed/x11.json	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/plugins/platforms/x11/windowed/x11.json	2017-02-21 13:04:59.000000000 +0100
@@ -4,6 +4,7 @@
         "Description[ca@valencia]": "Renderitza a una finestra imbricada en el sistema de finestres X11.", 
         "Description[ca]": "Renderitza a una finestra imbricada en el sistema de finestres X11.", 
         "Description[da]": "Rendér til et indlejret vindue på X11-vinduessystemet.", 
+        "Description[de]": "In ein eingebettetes Fenster auf X11-Fenstersystemen rendern.", 
         "Description[el]": "Αποτύπωση σε εμφωλευμένο παράθυρο σε παραθυρικό σύστημα X11.", 
         "Description[es]": "Renderizar en una ventana anidada en el sistema de ventanas X11.", 
         "Description[et]": "Pesastatud akna renderdamine X11 aknasüsteemis.", 
@@ -44,4 +45,4 @@
         "Name[x-test]": "xxx11xx"
     }, 
     "input": true
-}
\ No newline at end of file
+}
diff -Nru --exclude po kwin-5.8.4/scripts/enforcedeco/metadata.desktop kwin-5.8.6/scripts/enforcedeco/metadata.desktop
--- kwin-5.8.4/scripts/enforcedeco/metadata.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/scripts/enforcedeco/metadata.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -10,6 +10,7 @@
 Name[en_GB]=Enforces Window Decorations on GTK+ window
 Name[es]=Fuerza decoraciones en las ventanas de GTK+
 Name[et]=Akna dekoratsioonide kehtestamine GTK+ aknas
+Name[eu]=GTK+ leihoengan leiho-apaingarriak behartzen ditu
 Name[fi]=Pakottaa ikkunoiden kehykset GTK+-ikkunoille
 Name[fr]=Forcer les décorations de fenêtres avec les fenêtres GTK+
 Name[gl]=Aplica a decoración ás xanelas de GTK+
@@ -51,6 +52,7 @@
 Comment[en_GB]=Fixes functional deficits for client side decorated windows.
 Comment[es]=Fija deficiencias funcionales en ventanas decoradas en el lado cliente.
 Comment[et]=Kliendipoolsete dekoratsioonidega akende funktsionaalsete puudujääkide parandamine.
+Comment[eu]=Gabezia funtzionala konpontzen die bezeroen aldean apaindutako leihoei
 Comment[fi]=Korjaa asiakkaan kehystämien ikkunoiden toiminnallisia puutteita.
 Comment[fr]=Corrige les défaillances des fenêtres avec décorations gérées par le client.
 Comment[gl]=Soluciona problemas funcionais de xanelas decoradas no lado do cliente.
diff -Nru --exclude po kwin-5.8.4/scripts/minimizeall/metadata.desktop kwin-5.8.6/scripts/minimizeall/metadata.desktop
--- kwin-5.8.4/scripts/minimizeall/metadata.desktop	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/scripts/minimizeall/metadata.desktop	2017-02-21 13:04:59.000000000 +0100
@@ -9,6 +9,7 @@
 Name[en_GB]=MinimiseAll
 Name[es]=Maximizar todo
 Name[et]=Kõigi minimeerimine
+Name[eu]=Minimizatu guztiak
 Name[fi]=Pienennä kaikki
 Name[fr]=Tout réduire
 Name[gl]=Minimizalo todo
@@ -45,6 +46,7 @@
 Comment[en_GB]=Adds a shortcut to minimise all windows or unminimise all such way minimised windows
 Comment[es]=Añade un acceso rápido para minimizar todas la ventanas o restaurar todas las minimizadas de este modo
 Comment[et]=Kiirtoimingu lisamine kõigi akende minimeerimiseks või sel moel minimeeritud akende suuruse taastamiseks
+Comment[eu]=Erantsi lasterbide bat leiho guztiak minimizatzeko edo hala dauden leiho guztiak leheneratzeko
 Comment[fi]=Lisää pikanäppäimen, joka pienentää kaikki ikkunat tai palauttaa kaikki samalla tavalla pienennetyt ikkunat
 Comment[fr]=Ajoute un raccourci pour réduire toutes les fenêtres ou afficher toutes les fenêtres réduites
 Comment[gl]=Engade un atallo para minimizar todas as xanelas e restauralas de novo.
diff -Nru --exclude po kwin-5.8.4/tabbox/tabboxhandler.cpp kwin-5.8.6/tabbox/tabboxhandler.cpp
--- kwin-5.8.4/tabbox/tabboxhandler.cpp	2016-11-22 11:16:33.000000000 +0100
+++ kwin-5.8.6/tabbox/tabboxhandler.cpp	2017-02-21 13:04:59.000000000 +0100
@@ -323,6 +323,9 @@
         }
     }
     if (SwitcherItem *item = switcherItem()) {
+        // In case the model isn't yet set (see below), index will be reset and therefore we
+        // need to save the current index row (https://bugs.kde.org/show_bug.cgi?id=333511).
+        int indexRow = index.row();
         if (!item->model()) {
             QAbstractItemModel *model = nullptr;
             if (desktopMode) {
@@ -333,7 +336,7 @@
             item->setModel(model);
         }
         item->setAllDesktops(config.clientDesktopMode() == TabBoxConfig::AllDesktopsClients);
-        item->setCurrentIndex(index.row());
+        item->setCurrentIndex(indexRow);
         // everything is prepared, so let's make the whole thing visible
         item->setVisible(true);
     }

Reply to: