From 433a121838db216f9ad5b45dcfc2270c1cd8fa0c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 25 Jan 2019 08:42:24 +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"
---
 effects/fadingpopups/package/metadata.desktop | 2 ++
 effects/squash/package/metadata.desktop       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/effects/fadingpopups/package/metadata.desktop b/effects/fadingpopups/package/metadata.desktop
index 4317980451..1a3bfe9eb5 100644
--- a/effects/fadingpopups/package/metadata.desktop
+++ b/effects/fadingpopups/package/metadata.desktop
@@ -12,6 +12,7 @@ Name[nl]=Vervagende pop-ups
 Name[nn]=Inn- og uttoning av sprettoppvindauge
 Name[pl]=Zanikające okna wysuwne
 Name[pt]=Mensagens Desvanecentes
+Name[pt_BR]=Mensagens do fade
 Name[ru]=Растворяющиеся всплывающие окна
 Name[sk]=Miznúce vyskakovacie okná
 Name[sv]=Borttonande meddelanderutor
@@ -33,6 +34,7 @@ Comment[nl]=Laat pop-ups vloeiend opkomen/vervagen als ze worden weergegeven of
 Comment[nn]=Ton sprettoppvindauge gradvis inn og ut når dei vert viste eller gøymde
 Comment[pl]=Gładkie zanikanie i wyłanianie się okien wysuwnych przy ich otwieraniu i zamykaniu
 Comment[pt]=Fazer com que as janelas apareçam/desapareçam suavemente quando aparecem ou ficam escondidas
+Comment[pt_BR]=Faz as mensagens aparecerem/desaparecerem suavemente quando são exibidas ou ocultadas
 Comment[ru]=Всплывающие окна при закрытии будут становиться всё более прозрачными, а потом совсем исчезать
 Comment[sk]=Okná sa plynule objavia/zmiznú pri ich zobrazení alebo skrytí
 Comment[sv]=Gör att meddelanderutor mjukt tonas in eller ut när de visas eller döljs
diff --git a/effects/squash/package/metadata.desktop b/effects/squash/package/metadata.desktop
index d66e2cf257..58be3b3400 100644
--- a/effects/squash/package/metadata.desktop
+++ b/effects/squash/package/metadata.desktop
@@ -12,6 +12,7 @@ Comment[nl]=Krimp vensters wanneer ze geminimaliseerd zijn
 Comment[nn]=Skvis vindauge når dei vert minimerte
 Comment[pl]=Ściskanie okien, gdy ulegają minimalizacji
 Comment[pt]=Esmagar as janelas quando são minimizadas
+Comment[pt_BR]=Achatar as janelas quando são minimizadas
 Comment[ru]=Сжатие окна при сворачивании
 Comment[sk]=Deformuje okná pri ich minimalizovaní
 Comment[sv]=Kläm fönster när de minimeras
@@ -33,6 +34,7 @@ Name[nl]=Krimpen
 Name[nn]=Skvis
 Name[pl]=Ściskanie
 Name[pt]=Esmagar
+Name[pt_BR]=Achatar
 Name[ru]=Сжатие
 Name[sv]=Kläm
 Name[uk]=Складування

From f3c1786a897493f280e62a39b8e04d2c83d15567 Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Fri, 25 Jan 2019 10:33:24 +0000
Subject: [PATCH 2/2] [wayland] Send VirtualDesktop::done after editing a
 property

Summary:
The protocol is double buffered, after changing the name done should be
sent so that clients update.

Test Plan:
Changed a VD name on wayland
Pager tooltip updated

Reviewers: #kwin, zzag

Reviewed By: #kwin, zzag

Subscribers: zzag, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D18513
---
 virtualdesktops.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/virtualdesktops.cpp b/virtualdesktops.cpp
index 086af5cead..0dfb66a282 100644
--- a/virtualdesktops.cpp
+++ b/virtualdesktops.cpp
@@ -67,6 +67,7 @@ void VirtualDesktopManager::setVirtualDesktopManagement(KWayland::Server::Plasma
         connect(desktop, &VirtualDesktop::nameChanged, pvd,
             [desktop, pvd] {
                 pvd->setName(desktop->name());
+                pvd->sendDone();
             }
         );
         connect(pvd, &PlasmaVirtualDesktopInterface::activateRequested, this,