From a543e39c81c215f880e842058802b4378ba749c7 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 30 Oct 2017 04:45:10 +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"
---
 indicator/org.kde.kdeconnect.nonplasma.desktop        | 1 +
 plugins/remotekeyboard/kdeconnect_remotekeyboard.json | 2 ++
 urlhandler/org.kde.kdeconnect.telhandler.desktop      | 1 +
 3 files changed, 4 insertions(+)

diff --git a/indicator/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop
index 096f44f44..ef729a777 100644
--- a/indicator/org.kde.kdeconnect.nonplasma.desktop
+++ b/indicator/org.kde.kdeconnect.nonplasma.desktop
@@ -5,6 +5,7 @@ Name[ca@valencia]=Indicador del KDE Connect
 Name[cs]=Indikátor KDE Connect
 Name[da]=KDE Connect-indikator
 Name[de]=KDE-Connect-Anzeige
+Name[el]=Εφαρμογή ένδειξης KDE Connect
 Name[es]=Indicador de KDE Connect
 Name[eu]=KDE Connect adierazlea
 Name[fr]=Indicateur de KDE Connect
diff --git a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json
index a6dca629b..d60fc76e5 100644
--- a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json
+++ b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json
@@ -17,6 +17,7 @@
         "Description[ca]": "Useu el vostre teclat per enviar esdeveniments de tecla al dispositiu enllaçat",
         "Description[cs]": "Používejte svoji klávesnici pro odesílání událostí kláves na spárované zařízení",
         "Description[da]": "Brug dit tastatur til at sende tastehændelser til din parrede enhed",
+        "Description[el]": "Στέλνεις ό,τι πληκτρολογείς στη συσκευή ζεύγους",
         "Description[es]": "Use su teclado para enviar eventos de teclado a su dispositivo vinculado",
         "Description[eu]": "Erabili zure teklatua tekla-gertaerak zure parekatutako gailura bidaltzeko",
         "Description[fr]": "Utiliser votre clavier pour envoyer des évènements de touche au périphérique associé",
@@ -45,6 +46,7 @@
         "Name[ca]": "Teclat remot des de l'escriptori",
         "Name[cs]": "Vzdálená klávesnice pro plochu",
         "Name[da]": "Eksternt tastatur fra desktoppen",
+        "Name[el]": "Απομακρυσμένο πληκτρολόγιο της επιφάνειας εργασίας",
         "Name[es]": "Teclado remoto desde el equipo de escritorio",
         "Name[eu]": "Urruneko teklatua mahaigainetik",
         "Name[fr]": "Clavier distant depuis le bureau",
diff --git a/urlhandler/org.kde.kdeconnect.telhandler.desktop b/urlhandler/org.kde.kdeconnect.telhandler.desktop
index ded1f9983..f78e5dd5d 100644
--- a/urlhandler/org.kde.kdeconnect.telhandler.desktop
+++ b/urlhandler/org.kde.kdeconnect.telhandler.desktop
@@ -4,6 +4,7 @@ Name[ca]=Gestor d'URL de telèfons del KDE Connect
 Name[ca@valencia]=Gestor d'URL de telèfons del KDE Connect
 Name[cs]=Nástroj pro práci s URL telefonu v KDE Connect
 Name[da]=Telefon-URL-håndtering til KDE Connect
+Name[el]=KDE Connect χειριστής URL για σύνδεση τηλεφώνου
 Name[es]=Controlador de URL de teléfonos de KDE Connect
 Name[eu]=KDE Connect-en URL-kudeatzailea
 Name[fr]=Gestionnaire d'URL téléphoniques de KDE Connect