From 3b246e7368d2616541459d985e65909e3b200aff Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 9 Apr 2024 01:15:23 +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"
---
 app/org.kde.kdeconnect.app.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
index 641a5725e..f4cc5720a 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -71,7 +71,7 @@ GenericName[eu]=Gailuak sinkronizatzea
 GenericName[fi]=Laitteiden synkronointi
 GenericName[fr]=Synchronisation de périphériques
 GenericName[gl]=Sincronización de dispositivos
-GenericName[he]=סנכרון מכשיר
+GenericName[he]=סנכרון מכשירים
 GenericName[hu]=Eszközszinkronizáció
 GenericName[ia]=Synchronisation de dispositivo
 GenericName[id]=Sinkronisasi Peranti