From f6f77d3e65282b6aa292f89576b72b67f40a22b9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 22 Dec 2020 06:28:16 +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 4ce25af6..79abc9f0 100644
--- a/plasma_phone_components.notifyrc
+++ b/plasma_phone_components.notifyrc
@@ -6,7 +6,9 @@ Name[ca]=Plasma
 Name[cs]=Plasma
 Name[en_GB]=Plasma
 Name[es]=Plasma
+Name[eu]=Plasma
 Name[fi]=Plasma
+Name[fr]=Plasma
 Name[hu]=Plasma
 Name[ia]=Plasma
 Name[it]=Plasma
@@ -26,7 +28,9 @@ Name=Captured
 Name[ca]=Captura
 Name[en_GB]=Captured
 Name[es]=Capturado
+Name[eu]=Atzemanda
 Name[fi]=Kaapattu
+Name[fr]=Capturé
 Name[hu]=Rögzítve
 Name[ia]=Capturate
 Name[it]=Catturato
@@ -43,7 +47,9 @@ Comment=Captured
 Comment[ca]=Captura
 Comment[en_GB]=Captured
 Comment[es]=Capturado
+Comment[eu]=Atzemanda
 Comment[fi]=Kaapattu
+Comment[fr]=Capturé
 Comment[hu]=Rögzítve
 Comment[ia]=Capturate
 Comment[it]=Catturato