From 9d65b64a427b39bad1acfdf7174ac34043f9ed64 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 12 Jul 2022 02:56:25 +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"
---
 plugins/kdeconnect.notifyrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index 890786701..77cd6b192 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -483,7 +483,7 @@ Name=Ping Received
 Name[ar]=استُلمت وكزة
 Name[ast]=Ping recibíu
 Name[az]=Siqnal alındı
-Name[bg]=Получен е пинг
+Name[bg]=Пингът е приет
 Name[ca]=S'ha rebut un ping
 Name[ca@valencia]=S'ha rebut un ping
 Name[cs]=Ping přijat
@@ -529,7 +529,7 @@ Comment=Ping received
 Comment[ar]=استُلمت وكزة
 Comment[ast]=Recibióse un ping
 Comment[az]=Siqnal alındı
-Comment[bg]=Получен е пинг
+Comment[bg]=Пингът е приет
 Comment[bs]=Primili ste ping
 Comment[ca]=S'ha rebut un ping
 Comment[ca@valencia]=S'ha rebut un ping