From 99e43d39a2ae634d5f0d1c9f39eb7ca2e090a504 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 4 Dec 2020 06:29:34 +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 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc
index 9ab4682c..5d8edb6d 100644
--- a/plasma_phone_components.notifyrc
+++ b/plasma_phone_components.notifyrc
@@ -2,8 +2,10 @@
 IconName=preferences-system-windows-effect-screenshot
 Name=Plasma
 Name[ca]=Plasma
+Name[es]=Plasma
 Name[nl]=Plasma
 Name[pt]=Plasma
+Name[sl]=Plasma
 Name[sv]=Plasma
 Name[uk]=Плазма
 Name[x-test]=xxPlasmaxx
@@ -11,15 +13,19 @@ Name[x-test]=xxPlasmaxx
 [Event/captured]
 Name=Captured
 Name[ca]=Captura
+Name[es]=Capturado
 Name[nl]=Opgenomen
 Name[pt]=Capturada
+Name[sl]=Zajeto
 Name[sv]=Lagrad
 Name[uk]=Захоплено
 Name[x-test]=xxCapturedxx
 Comment=Captured
 Comment[ca]=Captura
+Comment[es]=Capturado
 Comment[nl]=Opgenomen
 Comment[pt]=Capturada
+Comment[sl]=Zajeto
 Comment[sv]=Lagrad
 Comment[uk]=Захоплено
 Comment[x-test]=xxCapturedxx