From baf52b49ac69e34c64508425b5b8a8bde9f36520 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 8 Apr 2020 11:04:09 +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"
---
 app/org.kde.kdeconnect.app.desktop             | 2 +-
 daemon/org.kde.kdeconnect.daemon.desktop.cmake | 2 +-
 data/kdeconnect-thunar.desktop                 | 2 +-
 data/org.kde.kdeconnect_open.desktop           | 6 +++---
 kcm/kcm_kdeconnect.desktop                     | 2 +-
 plasmoid/package/metadata.desktop              | 4 ++--
 plugins/kdeconnect.notifyrc                    | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
index 55d29ab81..45d0cd9f0 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -8,7 +8,7 @@ Name[ca]=KDE Connect
 Name[ca@valencia]=KDE Connect
 Name[cs]=KDE Connect
 Name[da]=KDE Connect
-Name[de]=KDE-Connect
+Name[de]=KDE Connect
 Name[el]=KDE Connect
 Name[en_GB]=KDE Connect
 Name[es]=KDE Connect
diff --git a/daemon/org.kde.kdeconnect.daemon.desktop.cmake b/daemon/org.kde.kdeconnect.daemon.desktop.cmake
index a635aa019..82996866d 100644
--- a/daemon/org.kde.kdeconnect.daemon.desktop.cmake
+++ b/daemon/org.kde.kdeconnect.daemon.desktop.cmake
@@ -18,7 +18,7 @@ Name[ca]=KDE Connect
 Name[ca@valencia]=KDE Connect
 Name[cs]=KDE Connect
 Name[da]=KDE Connect
-Name[de]=KDE-Connect
+Name[de]=KDE Connect
 Name[el]=KDE Connect
 Name[en_GB]=KDE Connect
 Name[es]=KDE Connect
diff --git a/data/kdeconnect-thunar.desktop b/data/kdeconnect-thunar.desktop
index cb27aacef..885657ad1 100644
--- a/data/kdeconnect-thunar.desktop
+++ b/data/kdeconnect-thunar.desktop
@@ -8,7 +8,7 @@ Name=Send via KDE Connect
 Name[ca]=Envia a través del KDE Connect
 Name[ca@valencia]=Envia a través del KDE Connect
 Name[cs]=Poslat přes KDE Connect
-Name[de]=Mit KDE-Connect versenden
+Name[de]=Mit KDE Connect versenden
 Name[en_GB]=Send via KDE Connect
 Name[es]=Enviar via KDE Connect
 Name[et]=Saatmine KDE Connecti kaudu
diff --git a/data/org.kde.kdeconnect_open.desktop b/data/org.kde.kdeconnect_open.desktop
index 36a3c7980..925aa05ce 100644
--- a/data/org.kde.kdeconnect_open.desktop
+++ b/data/org.kde.kdeconnect_open.desktop
@@ -3,7 +3,7 @@ GenericName=Open on connected device via KDE Connect
 GenericName[ca]=Obre al dispositiu connectat a través del KDE Connect
 GenericName[ca@valencia]=Obri al dispositiu connectat a través del KDE Connect
 GenericName[cs]=Otevřít na připojeném zařízení přes KDE Connect
-GenericName[de]=Ein verbundenes Gerät mit KDE-Connect öffnen
+GenericName[de]=Ein verbundenes Gerät mit KDE Connect öffnen
 GenericName[en_GB]=Open on connected device via KDE Connect
 GenericName[es]=Abrir en dispositivo conectado a través de KDE Connect
 GenericName[et]=Avamine ühendatud seadmes KDE Connecti kaudu
@@ -31,7 +31,7 @@ Name=Open on connected device via KDE Connect
 Name[ca]=Obre al dispositiu connectat a través del KDE Connect
 Name[ca@valencia]=Obri al dispositiu connectat a través del KDE Connect
 Name[cs]=Otevřít na připojeném zařízení přes KDE Connect
-Name[de]=Ein verbundenes Gerät mit KDE-Connect öffnen
+Name[de]=Ein verbundenes Gerät mit KDE Connect öffnen
 Name[en_GB]=Open on connected device via KDE Connect
 Name[es]=Abrir en dispositivo conectado a través de KDE Connect
 Name[et]=Avamine ühendatud seadmes KDE Connecti kaudu
@@ -59,7 +59,7 @@ Comment=Open on a connected device using KDE Connect
 Comment[ca]=Obre a un dispositiu connectat usant el KDE Connect
 Comment[ca@valencia]=Obri a un dispositiu connectat usant el KDE Connect
 Comment[cs]=Otevřít na připojeném zařízení pomocí KDE Connect
-Comment[de]=Ein verbundenes Gerät mit KDE-Connect öffnen
+Comment[de]=Ein verbundenes Gerät mit KDE Connect öffnen
 Comment[en_GB]=Open on a connected device using KDE Connect
 Comment[es]=Abrir en dispositivo conectado a través de KDE Connect
 Comment[et]=Avamine ühendatud seadmes KDE Connecti kaudu
diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop
index 812eda622..b0b8abeed 100755
--- a/kcm/kcm_kdeconnect.desktop
+++ b/kcm/kcm_kdeconnect.desktop
@@ -19,7 +19,7 @@ Name[ca]=KDE Connect
 Name[ca@valencia]=KDE Connect
 Name[cs]=KDE Connect
 Name[da]=KDE Connect
-Name[de]=KDE-Connect
+Name[de]=KDE Connect
 Name[el]=KDE Connect
 Name[en_GB]=KDE Connect
 Name[es]=KDE Connect
diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop
index 9ef0a0806..6cd6d338b 100644
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@@ -8,7 +8,7 @@ Name[ca]=KDE Connect
 Name[ca@valencia]=KDE Connect
 Name[cs]=KDE Connect
 Name[da]=KDE Connect
-Name[de]=KDE-Connect
+Name[de]=KDE Connect
 Name[el]=KDE Connect
 Name[en_GB]=KDE Connect
 Name[es]=KDE Connect
@@ -51,7 +51,7 @@ Comment[ca]=Mostra les notificacions dels vostres dispositius emprant el KDE Con
 Comment[ca@valencia]=Mostra les notificacions dels vostres dispositius emprant el KDE Connect
 Comment[cs]=Zobrazit upozornění z vašich zařízení pomocí KDE Connect
 Comment[da]=Vis bekendtgørelser fra dine enheder med KDE Connect
-Comment[de]=Zeigt Benachrichtigungen von Ihren Geräten mit KDE-Connect
+Comment[de]=Zeigt Benachrichtigungen von Ihren Geräten mit KDE Connect
 Comment[el]=Προβολή ειδοποιήσεων από τις συσκευές σας με το KDE Connect
 Comment[en_GB]=Show notifications from your devices using KDE Connect
 Comment[es]=KDE Connect muestra las notificaciones de sus dispositivos
diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index 2b8501830..41a1ccbae 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -9,7 +9,7 @@ Name[ca]=KDE Connect
 Name[ca@valencia]=KDE Connect
 Name[cs]=KDE Connect
 Name[da]=KDE Connect
-Name[de]=KDE-Connect
+Name[de]=KDE Connect
 Name[el]=KDE Connect
 Name[en_GB]=KDE Connect
 Name[es]=KDE Connect