From 7383a93e21bd0925d19f9af98b2c0d1194d3f359 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 25 Jan 2019 08:42:55 +0100
Subject: [PATCH 1/2] 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"
---
 dataengines/activities/plasma-dataengine-activities.desktop | 2 +-
 freespacenotifier/freespacenotifier.notifyrc                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dataengines/activities/plasma-dataengine-activities.desktop b/dataengines/activities/plasma-dataengine-activities.desktop
index 9d01624ae..8e7e0106d 100644
--- a/dataengines/activities/plasma-dataengine-activities.desktop
+++ b/dataengines/activities/plasma-dataengine-activities.desktop
@@ -79,7 +79,7 @@ Comment[he]=מידע אודות הפעילויות של Plasma
 Comment[hr]=Informacije o Plasminim aktivnostima
 Comment[hu]=Információk a Plasma aktivitásokról
 Comment[ia]=Information re activitates de Plasma
-Comment[id]=Informasi tentang Activities Plasma
+Comment[id]=Informasi tentang Aktivitas Plasma
 Comment[is]=Upplýsingar um Plasma virkni
 Comment[it]=Informazioni sulle attività di Plasma
 Comment[ja]=Plasma アクティビティの情報
diff --git a/freespacenotifier/freespacenotifier.notifyrc b/freespacenotifier/freespacenotifier.notifyrc
index a70eee5cc..df63b8b47 100644
--- a/freespacenotifier/freespacenotifier.notifyrc
+++ b/freespacenotifier/freespacenotifier.notifyrc
@@ -24,7 +24,7 @@ Comment[hi]=केडीई खाली स्थान सूचना डे
 Comment[hr]=KDE-ov servis za obavještavanje o slobodnom prostoru
 Comment[hu]=KDE szabad hely értesítő szolgáltatás
 Comment[ia]=Demone de notification de spatio libere de KDE
-Comment[id]=Daemon Notifikasi RUang Kosong KDE
+Comment[id]=Jurik Notifikasi RUang Kosong KDE
 Comment[is]=KDE tilkynningaþjónn fyrir laust pláss
 Comment[it]=Demone di notifica dello spazio libero di KDE
 Comment[ja]=KDE 空き領域デーモン

From aded7178706abf38a8016e70ef5ff0ad42287952 Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Fri, 25 Jan 2019 10:32:15 +0000
Subject: [PATCH 2/2] Reload virtual desktop name on change

Summary:
PlasmaVirtualDesktop at a protocol level is double buffered.

There's a done() command emitted after property changes. After this the
name might have changed.

Test Plan:
Changed a desktop name (with relevant kwin patch)
Name changed in the pager tooltip

Reviewers: #plasma, hein

Reviewed By: #plasma, hein

Subscribers: zzag, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D18512
---
 libtaskmanager/virtualdesktopinfo.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libtaskmanager/virtualdesktopinfo.cpp b/libtaskmanager/virtualdesktopinfo.cpp
index f89a6df0b..6bfdd59aa 100644
--- a/libtaskmanager/virtualdesktopinfo.cpp
+++ b/libtaskmanager/virtualdesktopinfo.cpp
@@ -364,6 +364,12 @@ void VirtualDesktopInfo::WaylandPrivate::addDesktop(const QString &id, quint32 p
         }
     );
 
+    QObject::connect(desktop, &KWayland::Client::PlasmaVirtualDesktop::done, q,
+        [this]() {
+            emit desktopNamesChanged();
+        }
+    );
+
     if (desktop->isActive()) {
         currentVirtualDesktop = id;
         emit currentDesktopChanged();