From 981851ea5ed6e0fbbeb78dcee87fd4bc5dbedc8c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 6 Dec 2020 06:09:24 +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 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc
index 6b572106..ed91b566 100644
--- a/plasma_phone_components.notifyrc
+++ b/plasma_phone_components.notifyrc
@@ -4,10 +4,12 @@ Name=Plasma
 Name[ca]=Plasma
 Name[cs]=Plasma
 Name[es]=Plasma
+Name[ia]=Plasma
 Name[nl]=Plasma
 Name[nn]=Plasma
 Name[pt]=Plasma
 Name[pt_BR]=Plasma
+Name[sk]=Plasma
 Name[sl]=Plasma
 Name[sv]=Plasma
 Name[uk]=Плазма
@@ -17,6 +19,7 @@ Name[x-test]=xxPlasmaxx
 Name=Captured
 Name[ca]=Captura
 Name[es]=Capturado
+Name[ia]=Capturate
 Name[nl]=Opgenomen
 Name[nn]=Opptak
 Name[pt]=Capturada
@@ -28,6 +31,7 @@ Name[x-test]=xxCapturedxx
 Comment=Captured
 Comment[ca]=Captura
 Comment[es]=Capturado
+Comment[ia]=Capturate
 Comment[nl]=Opgenomen
 Comment[nn]=Opptak
 Comment[pt]=Capturada