From f98953380fd729df1caf4ff74a4b9b7e0bb4a183 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 31 May 2020 20:22:34 +0200
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 +-
 .../kdeconnect_findthisdevice_config.desktop          |  2 +-
 urlhandler/org.kde.kdeconnect.handler.desktop         | 11 +++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop
index b0b8abeed..21e058d2c 100755
--- a/kcm/kcm_kdeconnect.desktop
+++ b/kcm/kcm_kdeconnect.desktop
@@ -110,7 +110,7 @@ X-KDE-Keywords[es]=Red,Android,Dispositivos
 X-KDE-Keywords[et]=Võrk,Android,Seadmed
 X-KDE-Keywords[eu]=Sarea,Android,Gailuak
 X-KDE-Keywords[fi]=Verkko,Android,Laitteet
-X-KDE-Keywords[fr]=Réseau,Android,Périphériques
+X-KDE-Keywords[fr]=Réseau, Android, Périphériques
 X-KDE-Keywords[gl]=rede,Android,dispositivos
 X-KDE-Keywords[he]=Network,Android,Devices,רשתות,אנדרואיד,התקנים,מכשירים
 X-KDE-Keywords[hu]=Hálózat,Android,Eszközök
diff --git a/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop b/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop
index 09e4a8686..88a59dc91 100644
--- a/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop
+++ b/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop
@@ -16,7 +16,7 @@ Name[es]=Preferencias del complemento «Encontrar este dispositivo»
 Name[et]=Seadme leidmise plugina seadistused
 Name[eu]=«Aurkitu gailu hau» pluginaren ezarpenak
 Name[fi]=Etsi tämä laite -liitännäisen asetukset
-Name[fr]=Paramètres du module Trouver ce périphérique
+Name[fr]=Paramètres du module « Trouver ce périphérique »
 Name[gl]=Configuración do complemento de atopar o dispositivo
 Name[id]=Pengesetan plugin Temukan Perangkat Ini
 Name[it]=Impostazioni dell'estensione Trova questo dispositivo
diff --git a/urlhandler/org.kde.kdeconnect.handler.desktop b/urlhandler/org.kde.kdeconnect.handler.desktop
index c701496dc..3fe7af4c2 100644
--- a/urlhandler/org.kde.kdeconnect.handler.desktop
+++ b/urlhandler/org.kde.kdeconnect.handler.desktop
@@ -1,5 +1,16 @@
 [Desktop Entry]
 Name=KDE Connect URL Handler
+Name[ca]=Gestor d'URL del KDE Connect
+Name[cs]=Nástroj pro práci s URL v KDE Connect
+Name[es]=Controlador de URL de KDE Connect
+Name[et]=KDE Connecti URL-ide käitleja
+Name[fr]=Gestionnaire d'URL de KDE Connect
+Name[lt]=KDE Connect URL doroklė
+Name[nl]=URL behandelaar van KDE-Connect
+Name[pt]=Tratamento de URL's do KDE Connect
+Name[sv]=KDE-anslut webbadresshanterare
+Name[uk]=Обробник адрес KDE Connect
+Name[x-test]=xxKDE Connect URL Handlerxx
 Exec=kdeconnect-handler %U
 Icon=kdeconnect
 Type=Application