From a74424f08974077f180677151b8b1b14540a93a1 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 16 Feb 2020 10:11:17 +0100
Subject: [PATCH 1/3] 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"
---
 runners/services/plasma-runner-services.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runners/services/plasma-runner-services.desktop b/runners/services/plasma-runner-services.desktop
index 8d837b67a..179c611ff 100644
--- a/runners/services/plasma-runner-services.desktop
+++ b/runners/services/plasma-runner-services.desktop
@@ -46,7 +46,7 @@ Name[ka]=პროგრამები
 Name[kk]=Қолданбалар
 Name[km]=កម្មវិធី
 Name[kn]=ಅನ್ವಯಗಳು
-Name[ko]=응용 프로그램
+Name[ko]=프로그램
 Name[ku]=Sepan
 Name[lt]=Programos
 Name[lv]=Programmas

From 203d7b42103bc47ffd1bd81c9cabf87ef9e971a0 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Sun, 16 Feb 2020 10:05:33 +0200
Subject: [PATCH 2/3] Extract messages from header files as well (Thanks to
 Victor Ryzhykh)

---
 shell/Messages.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/Messages.sh b/shell/Messages.sh
index b88412c1b..b38d1de35 100644
--- a/shell/Messages.sh
+++ b/shell/Messages.sh
@@ -1,2 +1,2 @@
 #! /bin/sh
-$XGETTEXT *.cpp -o $podir/plasmashell.pot
+$XGETTEXT *.cpp *.h -o $podir/plasmashell.pot

From 285155fad1f30c35476c074d470cde6f253d3e9b Mon Sep 17 00:00:00 2001
From: Nate Graham <nate@kde.org>
Date: Sun, 16 Feb 2020 17:07:33 -0700
Subject: [PATCH 3/3] [kcms/feedback] Improve default kcmshell window size

Summary:
BUG: 417747
FIXED-IN: 5.18.1

Test Plan:
Better default size when showing the most info: {F8107763}

However window is too now big when showing the least amount of info: {F8107762}

...But that seems kind of unavoidable unless we want to dynamically resize the window,
which people seem to hate.

Reviewers: #plasma, #vdg, apol

Reviewed By: apol

Subscribers: apol, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D27448
---
 kcms/feedback/package/contents/ui/main.qml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kcms/feedback/package/contents/ui/main.qml b/kcms/feedback/package/contents/ui/main.qml
index ac4327e41..82e29a03c 100644
--- a/kcms/feedback/package/contents/ui/main.qml
+++ b/kcms/feedback/package/contents/ui/main.qml
@@ -32,7 +32,8 @@ SimpleKCM {
     leftPadding: width * 0.1
     rightPadding: leftPadding
 
-    implicitHeight: Kirigami.Units.gridUnit * 23
+    implicitWidth: Kirigami.Units.gridUnit * 38
+    implicitHeight: Kirigami.Units.gridUnit * 33
 
 
     ColumnLayout {