From 70794cd912bbaf2f6271d3d96f1d038d8271018c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 18 May 2021 01:24:43 +0000
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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc
index fdb273ac..e58cd1ee 100644
--- a/plasma_phone_components.notifyrc
+++ b/plasma_phone_components.notifyrc
@@ -31,6 +31,7 @@ Name[x-test]=xxPlasmaxx
 Name=Captured
 Name[ca]=Captura
 Name[cs]=Zachyceno
+Name[de]=Aufgenommen
 Name[en_GB]=Captured
 Name[es]=Capturado
 Name[eu]=Atzemanda
@@ -53,6 +54,7 @@ Name[x-test]=xxCapturedxx
 Comment=Captured
 Comment[ca]=Captura
 Comment[cs]=Zachyceno
+Comment[de]=Aufgenommen
 Comment[en_GB]=Captured
 Comment[es]=Capturado
 Comment[eu]=Atzemanda