From 68678fc698d9378a52db2e2d32f28dddb19b93c0 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 12 May 2024 03:21:11 +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 b35fdb356..c8334f944 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -58,7 +58,7 @@ GenericName[ar]=مزامنة الأجهزة
 GenericName[az]=Cihazların eyniləşdirilməsi
 GenericName[bg]=Синхронизация на устройство
 GenericName[ca]=Sincronització de dispositius
-GenericName[ca@valencia]=Sincronització de dispositius
+GenericName[ca@valencia]=Sincronitzeu els dispositius
 GenericName[cs]=Synchronizace zařízení
 GenericName[da]=Enhedssynkronisering
 GenericName[de]=Geräteabgleich