From 6a0d2974f207c7de258f681627c2feb358cc7375 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 28 Nov 2020 06:26:40 +0100
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"
---
 kcm/kcm_kdeconnect.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop
index 3f8a7cbec..134c5da4f 100755
--- a/kcm/kcm_kdeconnect.desktop
+++ b/kcm/kcm_kdeconnect.desktop
@@ -59,7 +59,7 @@ Name[zh_TW]=KDE 連線
 
 Comment=Connect and sync your devices
 Comment[ar]=اتّصل وزامن أجهزتك
-Comment[ast]=Conecta y sincroniza preseos
+Comment[ast]=Coneuta y sincroniza preseos
 Comment[az]=Cihazlarınızı qoşmaq və eyniləşdirmək
 Comment[ca]=Connecta i sincronitza els vostres dispositius
 Comment[ca@valencia]=Connecta i sincronitza els vostres dispositius