From 417279e9c74f46d616c432b17626d719022a143b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 13 Dec 2020 06:38:47 +0100
Subject: [PATCH] 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"
---
 plasma_phone_components.notifyrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc
index ed91b566..191902f6 100644
--- a/plasma_phone_components.notifyrc
+++ b/plasma_phone_components.notifyrc
@@ -3,6 +3,7 @@ IconName=preferences-system-windows-effect-screenshot
 Name=Plasma
 Name[ca]=Plasma
 Name[cs]=Plasma
+Name[en_GB]=Plasma
 Name[es]=Plasma
 Name[ia]=Plasma
 Name[nl]=Plasma
@@ -18,6 +19,7 @@ Name[x-test]=xxPlasmaxx
 [Event/captured]
 Name=Captured
 Name[ca]=Captura
+Name[en_GB]=Captured
 Name[es]=Capturado
 Name[ia]=Capturate
 Name[nl]=Opgenomen
@@ -30,6 +32,7 @@ Name[uk]=Захоплено
 Name[x-test]=xxCapturedxx
 Comment=Captured
 Comment[ca]=Captura
+Comment[en_GB]=Captured
 Comment[es]=Capturado
 Comment[ia]=Capturate
 Comment[nl]=Opgenomen