From bd73ef548b29af7ebc4ac4afb925bf35f0d8e1f4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 13 Feb 2024 02:56:56 +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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index 354ae7082..fd9407bba 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -914,6 +914,7 @@ Name[pt]=Texto Recebido
 Name[pt_BR]=Texto recebido
 Name[ro]=Text primit
 Name[ru]=Текст получен
+Name[sk]=Správa prijatá
 Name[sl]=Besedilo prejeto
 Name[sv]=Text mottagen
 Name[ta]=குறுஞ்செய்தி வந்துள்ளது
@@ -951,6 +952,7 @@ Comment[pt]=Recebeu algum texto
 Comment[pt_BR]=Recebido algum texto
 Comment[ro]=S-a primit ceva text
 Comment[ru]=Получен некоторый текст
+Comment[sk]=Nejaká správa prijatá
 Comment[sl]=Prejeto nekaj besedila
 Comment[sv]=Tog emot text
 Comment[ta]=குறுஞ்செய்தி வந்துள்ளது