From 0ed48894b8ef9df0bd4f183897ab35916e2fd561 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 23 Oct 2024 03:04:31 +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 c1afa45c1..364ea7e2a 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -101,7 +101,7 @@ GenericName[sr@ijekavianlatin]=Sinhronizacija uređaja
 GenericName[sr@latin]=Sinhronizacija uređaja
 GenericName[sv]=Enhetssynkronisering
 GenericName[ta]=சாதன ஒத்திசைவு
-GenericName[tr]=Aygıt Eşzamanlaması
+GenericName[tr]=Aygıt Eşzamanlama
 GenericName[uk]=Синхронізація із пристроями
 GenericName[x-test]=xxDevice Synchronizationxx
 GenericName[zh_CN]=设备同步