From d513d9e37eb69441485b382d2a937418eaab37cf Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 15 Jul 2017 05:39:16 +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"
---
 indicator/org.kde.kdeconnect.nonplasma.desktop       |  6 ++++++
 .../remotecommands/kdeconnect_remotecommands.json    |  2 +-
 .../remotekeyboard/kdeconnect_remotekeyboard.json    | 12 ++++++++++++
 urlhandler/org.kde.kdeconnect.telhandler.desktop     |  6 ++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/indicator/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop
index 7df7f3cec..de9854875 100755
--- a/indicator/org.kde.kdeconnect.nonplasma.desktop
+++ b/indicator/org.kde.kdeconnect.nonplasma.desktop
@@ -1,5 +1,11 @@
 [Desktop Entry]
 Name=KDE Connect Indicator
+Name[ca]=Indicador del KDE Connect
+Name[pt]=Indicador do KDE Connect
+Name[sv]=KDE-anslut indikator
+Name[tr]=KDE Connect Göstergesi
+Name[uk]=Індикатор KDE Connect
+Name[x-test]=xxKDE Connect Indicatorxx
 Comment=Display information about your devices
 Comment[ca]=Mostra la informació dels vostres dispositius
 Comment[ca@valencia]=Mostra la informació dels vostres dispositius
diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json
index 4b0db6413..2ed624484 100644
--- a/plugins/remotecommands/kdeconnect_remotecommands.json
+++ b/plugins/remotecommands/kdeconnect_remotecommands.json
@@ -46,7 +46,7 @@
         "License": "GPL",
         "Name": "Host remote commands",
         "Name[ca@valencia]": "Ordes a la màquina remota",
-        "Name[ca]": "Ordres a la màquina remota",
+        "Name[ca]": "Allotja ordres remotes",
         "Name[cs]": "Přijímat vzdálené příkazy",
         "Name[da]": "Vært for eksterne kommandoer",
         "Name[es]": "Órdenes en servidor remoto",
diff --git a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json
index da85e93f3..89374b88b 100644
--- a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json
+++ b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json
@@ -14,11 +14,23 @@
             }
         ],
         "Description": "Use your keyboard to send key-events to your paired device",
+        "Description[ca]": "Useu el vostre teclat per enviar esdeveniments de tecla al dispositiu enllaçat",
+        "Description[pt]": "Use o seu teclado para enviar eventos de teclado para o seu dispositivo emparelhado",
+        "Description[sv]": "Använd tangentbordet för att skicka tangenthändelser till den parade enheten",
+        "Description[tr]": "Eşleşmiş cihazınıza önemli etkinlikler göndermek için klavyenizi kullanın",
+        "Description[uk]": "Скористайтеся вашою клавіатурою для надсилання подій натискання клавіш на пов’язаний пристрій",
+        "Description[x-test]": "xxUse your keyboard to send key-events to your paired devicexx",
         "EnabledByDefault": true,
         "Icon": "edit-select",
         "Id": "kdeconnect_remotekeyboard",
         "License": "GPL",
         "Name": "Remote keyboard from the desktop",
+        "Name[ca]": "Teclat remot des de l'escriptori",
+        "Name[pt]": "Teclado remoto no ecrã",
+        "Name[sv]": "Externt tangentbord från skrivbordet",
+        "Name[tr]": "Masaüstünden uzak klavye",
+        "Name[uk]": "Віддалена клавіатура з комп’ютера",
+        "Name[x-test]": "xxRemote keyboard from the desktopxx",
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ],
diff --git a/urlhandler/org.kde.kdeconnect.telhandler.desktop b/urlhandler/org.kde.kdeconnect.telhandler.desktop
index d3a5507e7..d11a4b8a7 100644
--- a/urlhandler/org.kde.kdeconnect.telhandler.desktop
+++ b/urlhandler/org.kde.kdeconnect.telhandler.desktop
@@ -1,5 +1,11 @@
 [Desktop Entry]
 Name=KDE Connect Phone URL Handler
+Name[ca]=Gestor d'URL de telèfons del KDE Connect
+Name[pt]=Tratamento de URL's no Telefone do KDE Connect
+Name[sv]=KDE-anslut hanterare av telefonwebbadress
+Name[tr]=KDE Connect Telefon URL İşleyici
+Name[uk]=Обробник телефонних адрес KDE Connect
+Name[x-test]=xxKDE Connect Phone URL Handlerxx
 Exec=kdeconnect-handler %U
 Icon=kdeconnect
 Type=Application