From 12d322a0f9e698808f3c6c3530544e116a8da917 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 9 Mar 2017 07:52:59 +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 +-
 kcm/org.kde.kdeconnect.kcm.desktop | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop
index ec7302497..30f7a8763 100755
--- a/kcm/kcm_kdeconnect.desktop
+++ b/kcm/kcm_kdeconnect.desktop
@@ -49,7 +49,7 @@ Comment[cs]=Připojte a synchronizujte svá zařízení
 Comment[da]=Forbind og synkronisér dine enheder
 Comment[de]=Verbinden und Abgleichen Ihrer Geräte
 Comment[en_GB]=Connect and sync your devices
-Comment[es]=Conectar y sincronizar sus dispositivos
+Comment[es]=Conecte y sincronice sus dispositivos
 Comment[et]=Oma seadmete ühendamine ja sünkroonimine
 Comment[fi]=Yhdistä ja synkronoi laitteitasi
 Comment[fr]=Connectez et synchronisez vos périphériques
diff --git a/kcm/org.kde.kdeconnect.kcm.desktop b/kcm/org.kde.kdeconnect.kcm.desktop
index fc3d6c193..713691858 100755
--- a/kcm/org.kde.kdeconnect.kcm.desktop
+++ b/kcm/org.kde.kdeconnect.kcm.desktop
@@ -37,7 +37,7 @@ GenericName[cs]=Připojte a synchronizujte svá zařízení
 GenericName[da]=Forbind og synkronisér dine enheder
 GenericName[de]=Verbinden und Abgleichen Ihrer Geräte
 GenericName[en_GB]=Connect and sync your devices
-GenericName[es]=Conectar y sincronizar sus dispositivos
+GenericName[es]=Conecte y sincronice sus dispositivos
 GenericName[et]=Oma seadmete ühendamine ja sünkroonimine
 GenericName[fi]=Yhdistä ja synkronoi laitteitasi
 GenericName[fr]=Connectez et synchronisez vos périphériques