From 447d74bda42f7eb5d7f1fc095f6707e20ab4b471 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 28 May 2017 04:51:40 +0200
Subject: [PATCH 1/5] GIT_SILENT made messages (after extraction)

---
 org.kde.kdeconnect.kcm.appdata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.kde.kdeconnect.kcm.appdata.xml b/org.kde.kdeconnect.kcm.appdata.xml
index 6a7236608..cf6b0587b 100644
--- a/org.kde.kdeconnect.kcm.appdata.xml
+++ b/org.kde.kdeconnect.kcm.appdata.xml
@@ -98,7 +98,7 @@
   <url type="homepage">https://community.kde.org/KDEConnect/</url>
   <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=kdeconnect</url>
   <url type="help">https://docs.kde.org/index.php?application=kdeconnect-kde&amp;language=en</url>
-<!--
+  <!--
   <screenshots>
     <screenshot type="default">
       <image>http://kde.org/images/screenshots/kalgebra.png</image>

From 78b91cf4c0af6fc84b7ea862dd81bcf885f99eda Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 30 May 2017 05:29:21 +0200
Subject: [PATCH 2/5] 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"
---
 plugins/findmyphone/kdeconnect_findmyphone.json             | 2 ++
 plugins/notifications/kdeconnect_notifications.json         | 2 ++
 plugins/remotecommands/kdeconnect_remotecommands.json       | 1 +
 plugins/sendnotifications/kdeconnect_sendnotifications.json | 1 +
 plugins/telephony/kdeconnect_telephony.json                 | 1 +
 5 files changed, 7 insertions(+)

diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json
index b489dd762..9d0f0bed6 100644
--- a/plugins/findmyphone/kdeconnect_findmyphone.json
+++ b/plugins/findmyphone/kdeconnect_findmyphone.json
@@ -43,6 +43,7 @@
         "Description[sr@latin]": "Nađite izgubljeni telefon aktiviranjem zvuka alarma",
         "Description[sr]": "Нађите изгубљени телефон активирањем звука аларма",
         "Description[sv]": "Hitta din förlorade telefon genom att få den att spela ett alarmljud",
+        "Description[tr]": "Bir alarm sesi çalarak kayıp telefonunuzu bulun    ",
         "Description[uk]": "Знайти загублений телефон, наказавши йому відтворити дзвінок",
         "Description[x-test]": "xxFind your lost phone by making it play an alarm soundxx",
         "Description[zh_CN]": "通过播放闹铃声来找到您不见的手机",
@@ -75,6 +76,7 @@
         "Name[sr@latin]": "Zvoni moj telefonu",
         "Name[sr]": "Звони мој телефону",
         "Name[sv]": "Hitta min telefon",
+        "Name[tr]": "Telefonumu çaldır",
         "Name[uk]": "Дзвінок на вашому телефоні",
         "Name[x-test]": "xxRing my phonexx",
         "Name[zh_CN]": "让我的手机响铃",
diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json
index 590377983..4b7e8c346 100644
--- a/plugins/notifications/kdeconnect_notifications.json
+++ b/plugins/notifications/kdeconnect_notifications.json
@@ -35,6 +35,7 @@
         "Description[sr@latin]": "Prikazuje obaveštenja sa uređaja na računaru i održava ih ažurnim",
         "Description[sr]": "Приказује обавештења са уређаја на рачунару и одржава их ажурним",
         "Description[sv]": "Visa enhetens underrättelser på datorn och håll dem synkroniserade",
+        "Description[tr]": "Aygıtın bildirimlerini bilgisayarda göster ve eşzamanlı tut",
         "Description[uk]": "Показ сповіщень з пристрою на цьому комп’ютері та підтримання синхронізації даних сповіщень",
         "Description[x-test]": "xxShow device's notifications on this computer and keep them in syncxx",
         "Description[zh_CN]": "在电脑显示手机通知并保持同步",
@@ -66,6 +67,7 @@
         "Name[sr@latin]": "Prijem obaveštenja",
         "Name[sr]": "Пријем обавештења",
         "Name[sv]": "Ta emot underrättelser",
+        "Name[tr]": "Bildirimleri al",
         "Name[uk]": "Отримати сповіщення",
         "Name[x-test]": "xxReceive notificationsxx",
         "Name[zh_CN]": "接收通知",
diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json
index 83989a509..f4d685b03 100644
--- a/plugins/remotecommands/kdeconnect_remotecommands.json
+++ b/plugins/remotecommands/kdeconnect_remotecommands.json
@@ -64,6 +64,7 @@
         "Name[sr@latin]": "Daljinske naredbe domaćina",
         "Name[sr]": "Даљинске наредбе домаћина",
         "Name[sv]": "Fjärrkommandon för värddator",
+        "Name[tr]": "Sunucu uzaktan komutları",
         "Name[uk]": "Віддалені команди вузлу",
         "Name[x-test]": "xxHost remote commandsxx",
         "Name[zh_TW]": "主機與遠端指令",
diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications.json b/plugins/sendnotifications/kdeconnect_sendnotifications.json
index af5534d1b..97db5168b 100644
--- a/plugins/sendnotifications/kdeconnect_sendnotifications.json
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json
@@ -67,6 +67,7 @@
         "Name[sr@latin]": "Šalji obaveštenja",
         "Name[sr]": "Шаљи обавештења",
         "Name[sv]": "Skicka underrättelser",
+        "Name[tr]": "Bildirim gönder",
         "Name[uk]": "Надіслати сповіщення",
         "Name[x-test]": "xxSend notificationsxx",
         "Name[zh_CN]": "发送通知",
diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json
index f25556807..01856565b 100644
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@@ -34,6 +34,7 @@
         "Description[sr@latin]": "Prikazuje obaveštenja za pozive i SMS",
         "Description[sr]": "Приказује обавештења за позиве и СМС",
         "Description[sv]": "Visa underrättelser om samtal och SMS",
+        "Description[tr]": "Çağrı ve SMS'ler için bildirim göster",
         "Description[uk]": "Показ сповіщень щодо дзвінків і SMS",
         "Description[x-test]": "xxShow notifications for calls and SMSxx",
         "Description[zh_CN]": "显示来电和短信通知",

From 664fd443f059fb0041ee8157bd8d1d5818112f66 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 13 Jun 2017 05:54:34 +0200
Subject: [PATCH 3/5] 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/org.kde.kdeconnect.kcm.desktop                             | 1 +
 org.kde.kdeconnect.nonplasma.desktop                           | 2 ++
 plugins/battery/kdeconnect_battery.json                        | 2 ++
 plugins/clipboard/kdeconnect_clipboard.json                    | 2 ++
 plugins/findmyphone/kdeconnect_findmyphone.json                | 2 ++
 plugins/kdeconnect.notifyrc                                    | 3 ++-
 plugins/lockdevice/kdeconnect_lockdevice.json                  | 1 +
 plugins/mousepad/kdeconnect_mousepad.json                      | 2 ++
 plugins/mpriscontrol/kdeconnect_mpriscontrol.json              | 2 ++
 plugins/mprisremote/kdeconnect_mprisremote.json                | 1 +
 plugins/notifications/kdeconnect_notifications.json            | 2 ++
 plugins/pausemusic/kdeconnect_pausemusic.json                  | 2 ++
 plugins/ping/kdeconnect_ping.json                              | 2 ++
 plugins/remotecommands/kdeconnect_remotecommands.json          | 2 ++
 plugins/remotecontrol/kdeconnect_remotecontrol.json            | 1 +
 plugins/runcommand/kdeconnect_runcommand.json                  | 2 ++
 plugins/runcommand/kdeconnect_runcommand_config.desktop        | 1 +
 .../screensaver-inhibit/kdeconnect_screensaver_inhibit.json    | 2 ++
 plugins/sendnotifications/kdeconnect_sendnotifications.json    | 2 ++
 .../kdeconnect_sendnotifications_config.desktop                | 1 +
 plugins/sftp/kdeconnect_sftp.json                              | 2 ++
 plugins/share/kdeconnect_share.json                            | 2 ++
 plugins/telephony/kdeconnect_telephony.json                    | 2 ++
 23 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/kcm/org.kde.kdeconnect.kcm.desktop b/kcm/org.kde.kdeconnect.kcm.desktop
index 5aa6779d0..463211bd6 100755
--- a/kcm/org.kde.kdeconnect.kcm.desktop
+++ b/kcm/org.kde.kdeconnect.kcm.desktop
@@ -13,6 +13,7 @@ Name[en_GB]=KDE Connect Settings
 Name[es]=Ajustes de KDE Connect
 Name[et]=KDE Connecti seadistused
 Name[fi]=KDE Connectin asetukset
+Name[fr]=Paramètres de KDE Connect
 Name[gl]=Configuración de KDE Connect
 Name[hu]=A KDE Connect beállításai
 Name[it]=Impostazioni di KDE Connect
diff --git a/org.kde.kdeconnect.nonplasma.desktop b/org.kde.kdeconnect.nonplasma.desktop
index 13f0e0cd4..9133d70a7 100755
--- a/org.kde.kdeconnect.nonplasma.desktop
+++ b/org.kde.kdeconnect.nonplasma.desktop
@@ -9,6 +9,7 @@ Name[en_GB]=KDE Connect Monitor
 Name[es]=Monitor de KDE Connect
 Name[et]=KDE Connecti monitor
 Name[fi]=KDE Connect -valvonta
+Name[fr]=Moniteur KDE Connect
 Name[gl]=Monitor de KDE Connect
 Name[hu]=KDE Connect monitor
 Name[it]=Monitor di KDE Connect
@@ -40,6 +41,7 @@ Comment[en_GB]=Display information about your devices
 Comment[es]=Mostrar información sobre sus dispositivos
 Comment[et]=Teabe kuvamine seadmete kohta
 Comment[fi]=Näyttää tietoa laitteistasi
+Comment[fr]=Afficher les informations de vos périphériques
 Comment[gl]=Mostrar información sobre os dispositivos
 Comment[hu]=Információk megjelenítése az eszközeiről
 Comment[it]=Visualizza informazioni sui tuoi dispositivi
diff --git a/plugins/battery/kdeconnect_battery.json b/plugins/battery/kdeconnect_battery.json
index 35513148f..a4b7a0bb3 100644
--- a/plugins/battery/kdeconnect_battery.json
+++ b/plugins/battery/kdeconnect_battery.json
@@ -21,6 +21,7 @@
         "Description[es]": "Mostrar la batería del teléfono junto a la batería del equipo",
         "Description[et]": "Telefoniaku näitamine otse arvutiaku kõrval",
         "Description[fi]": "Näytä puhelimesi akku tietokoneen akun rinnalla",
+        "Description[fr]": "Affichez la batterie de votre téléphone à côté de la batterie de votre ordinateur",
         "Description[gl]": "Mostra o nivel de batería do teléfono canda o nivel de batería do computador.",
         "Description[hu]": "A telefon akkumulátorának megjelenítése a számítógépé mellett",
         "Description[it]": "Mostra la batteria del telefono accanto alla batteria del computer",
@@ -55,6 +56,7 @@
         "Name[es]": "Monitor de batería",
         "Name[et]": "Aku jälgija",
         "Name[fi]": "Akkuvalvonta",
+        "Name[fr]": "Moniteur de batterie",
         "Name[gl]": "Vixilante da batería",
         "Name[hu]": "Akkumulátorfigyelő",
         "Name[it]": "Monitor della batteria",
diff --git a/plugins/clipboard/kdeconnect_clipboard.json b/plugins/clipboard/kdeconnect_clipboard.json
index bfa77af88..6d04a1822 100644
--- a/plugins/clipboard/kdeconnect_clipboard.json
+++ b/plugins/clipboard/kdeconnect_clipboard.json
@@ -21,6 +21,7 @@
         "Description[es]": "Compartir portapapeles entre dispositivos",
         "Description[et]": "Lõikepuhvri jagamine seadmete vahel",
         "Description[fi]": "Jaa leikepöytä laitteiden välillä",
+        "Description[fr]": "Partagez le presse-papiers entre périphériques",
         "Description[gl]": "Comparta o portapapeis entre os dispositivos.",
         "Description[hu]": "A vágólap megosztása az eszközök között",
         "Description[it]": "Condividi gli appunti tra i dispositivi",
@@ -55,6 +56,7 @@
         "Name[es]": "Portapapeles",
         "Name[et]": "Lõikepuhver",
         "Name[fi]": "Leikepöytä",
+        "Name[fr]": "Presse-papiers",
         "Name[gl]": "Portapapeis",
         "Name[hu]": "Vágólap",
         "Name[it]": "Appunti",
diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json
index 9d0f0bed6..b76c624bd 100644
--- a/plugins/findmyphone/kdeconnect_findmyphone.json
+++ b/plugins/findmyphone/kdeconnect_findmyphone.json
@@ -29,6 +29,7 @@
         "Description[es]": "Encuentre su teléfono perdido haciéndole reproducir un sonido de alarma",
         "Description[et]": "Kaotsi läinud telefoni leidmine sellel häireheli esitamisega",
         "Description[fi]": "Löydä hukkaamasi puhelin laittamalla se soittamaan hälytysääntä",
+        "Description[fr]": "Trouver votre téléphone perdu en déclenchant une alarme",
         "Description[it]": "Trova il tuo telefono smarrito facendogli suonare un allarme sonoro",
         "Description[ko]": "알람 소리를 울려서 잃어버린 휴대폰 찾기",
         "Description[nl]": "Zoek uw verloren telefoon door het een wekkersignaal te laten spelen",
@@ -62,6 +63,7 @@
         "Name[es]": "Hacer sonar mi teléfono",
         "Name[et]": "Helista minu telefonile",
         "Name[fi]": "Soita puhelimeeni",
+        "Name[fr]": "Faire sonner mon téléphone",
         "Name[it]": "Fai squillare il mio telefono",
         "Name[ko]": "내 휴대폰 울리기",
         "Name[nl]": "Bel mijn telefoon",
diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index 43db20f48..904a24652 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -84,7 +84,7 @@ Name[en_GB]=Pairing Request
 Name[es]=Petición de vinculación
 Name[et]=Paardumissoov
 Name[fi]=Paripyyntö
-Name[fr]=Demande d'appariement
+Name[fr]=Demande d'association
 Name[gl]=Solicitude de emparellamento
 Name[hu]=Párosítási kérés
 Name[it]=Richiesta di associazione
@@ -116,6 +116,7 @@ Comment[en_GB]=Pairing request received from a device
 Comment[es]=Petición de vinculación recibida desde un dispositivo
 Comment[et]=Seadmelt saadi paardumissoov
 Comment[fi]=Saatiin paripyyntö laitteelta
+Comment[fr]=Demande d'association provenant d'un périphérique
 Comment[it]=Richiesta di associazione ricevuta da un dispositivo
 Comment[ko]=장치에서 연결 요청을 받음
 Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat
diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json
index 77b35cb56..4b25aebac 100644
--- a/plugins/lockdevice/kdeconnect_lockdevice.json
+++ b/plugins/lockdevice/kdeconnect_lockdevice.json
@@ -21,6 +21,7 @@
         "Description[es]": "Bloquear sus sistemas",
         "Description[et]": "Oma süsteemide lukustamine",
         "Description[fi]": "Lukitsee järjestelmäsi",
+        "Description[fr]": "Bloque votre système",
         "Description[gl]": "Bloquea os seus sistemas.",
         "Description[it]": "Blocca i tuoi sistemi",
         "Description[ko]": "내 시스템 잠그기",
diff --git a/plugins/mousepad/kdeconnect_mousepad.json b/plugins/mousepad/kdeconnect_mousepad.json
index 0c7480363..a839ecb70 100644
--- a/plugins/mousepad/kdeconnect_mousepad.json
+++ b/plugins/mousepad/kdeconnect_mousepad.json
@@ -21,6 +21,7 @@
         "Description[es]": "Usar teléfono como panel táctil y teclado",
         "Description[et]": "Telefoni kasutamine puutepadja ja klaviatuurina",
         "Description[fi]": "Käytä puhelintasi kosketuslevynä ja näppäimistönä",
+        "Description[fr]": "Utilisez votre téléphone comme un pavé tactile et un clavier",
         "Description[gl]": "Usar o teléfono móbil como touchpad e teclado.",
         "Description[hu]": "A telefon használata érintőtáblaként és billentyűzetként",
         "Description[it]": "Usa il telefono come touchpad e tastiera",
@@ -55,6 +56,7 @@
         "Name[es]": "Entrada virtual",
         "Name[et]": "Virtuaalsisestus",
         "Name[fi]": "Virtuaalinen syöttö",
+        "Name[fr]": "Entrée virtuelle",
         "Name[gl]": "Entrada virtual",
         "Name[hu]": "Virtuális bevitel",
         "Name[it]": "Inserimento virtuale",
diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
index a3f785abc..82a19e9f6 100644
--- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
+++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
@@ -21,6 +21,7 @@
         "Description[es]": "Controlar remotamente vídeos y música",
         "Description[et]": "Oma muusika ja videote kaugjuhtimine",
         "Description[fi]": "Kauko-ohjain musiikkiisi ja videoihisi",
+        "Description[fr]": "Contrôlez à distance votre musique et vos vidéos",
         "Description[gl]": "Use o teléfono móbil como mando a distancia para música e vídeos.",
         "Description[hu]": "A zene- és videolejátszás irányítása távolról",
         "Description[it]": "Controlla da remoto la tua musica e i video",
@@ -55,6 +56,7 @@
         "Name[es]": "Receptor de control multimedia",
         "Name[et]": "Multimeedia juhtimine",
         "Name[fi]": "Multimediakauko-ohjain",
+        "Name[fr]": "Receveur de contrôle multimédia",
         "Name[gl]": "Receptor de controis multimedia",
         "Name[hu]": "Multimédiavezérlő",
         "Name[it]": "Ricevitore di controllo multimediale",
diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json
index 9b035d318..db3b8f19d 100644
--- a/plugins/mprisremote/kdeconnect_mprisremote.json
+++ b/plugins/mprisremote/kdeconnect_mprisremote.json
@@ -21,6 +21,7 @@
         "Description[es]": "Controlar los servicios MPRIS",
         "Description[et]": "MPRIS-teenuste juhtimine",
         "Description[fi]": "Ohjaa MPRIS-palveluita",
+        "Description[fr]": "Controllez les services MPRIS",
         "Description[gl]": "Controle servizos de MPRIS.",
         "Description[it]": "Servizi di controllo MPRIS",
         "Description[ko]": "MPRIS 서비스 제어",
diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json
index 4b7e8c346..00293e3eb 100644
--- a/plugins/notifications/kdeconnect_notifications.json
+++ b/plugins/notifications/kdeconnect_notifications.json
@@ -21,6 +21,7 @@
         "Description[es]": "Mostrar notificaciones del dispositivo en este equipo y mantenerlas en sincronía",
         "Description[et]": "Seadme märguannete näitamine arvutis ja nende sünkroonis hoidmine",
         "Description[fi]": "Näytä laitteen ilmoitukset tällä tietokoneella ja pidä ne ajan tasalla",
+        "Description[fr]": "Affichez les notifications du téléphone sur l'ordinateur et synchronisez-les",
         "Description[it]": "Mostra le notifiche del telefono sul tuo computer e tienile sincronizzate",
         "Description[ko]": "휴대폰 알림을 컴퓨터에 표시하고 동기화하기",
         "Description[nl]": "Apparaatmeldingen op deze computer tonen en ze gesynchroniseerd houden",
@@ -53,6 +54,7 @@
         "Name[es]": "Recibir notificaciones",
         "Name[et]": "Märguannete vastuvõtmine",
         "Name[fi]": "Vastaanota ilmoituksia",
+        "Name[fr]": "Recevoir les notifications",
         "Name[it]": "Ricevi notifiche",
         "Name[ko]": "알림 받기",
         "Name[nl]": "Meldingen ontvangen",
diff --git a/plugins/pausemusic/kdeconnect_pausemusic.json b/plugins/pausemusic/kdeconnect_pausemusic.json
index 51ec23c88..c17587dbc 100644
--- a/plugins/pausemusic/kdeconnect_pausemusic.json
+++ b/plugins/pausemusic/kdeconnect_pausemusic.json
@@ -21,6 +21,7 @@
         "Description[es]": "Pausar música/video durante las llamadas telefónicas",
         "Description[et]": "Muusika või video peatamine telefonikõne ajal",
         "Description[fi]": "Keskeytä musiikki ja videot puhelun aikana",
+        "Description[fr]": "Mettre en pause la musique / les vidéos pendant un appel téléphonique",
         "Description[gl]": "Deter a reprodución de música ou vídeos durante as chamadas.",
         "Description[hu]": "A médialejátszás szüneteltetése telefonhívások közben",
         "Description[it]": "Sospendi musica/video durante una chiamata",
@@ -55,6 +56,7 @@
         "Name[es]": "Pausar medios durante las llamadas",
         "Name[et]": "Meedia peatamine kõne ajal",
         "Name[fi]": "Keskeytä toisto puhelujen aikana",
+        "Name[fr]": "Mettre en pause le média pendant les appels",
         "Name[gl]": "Deter a reprodución durante as chamadas.",
         "Name[hu]": "Médialejátszás felfüggesztése",
         "Name[it]": "Sospendi i lettori multimediali",
diff --git a/plugins/ping/kdeconnect_ping.json b/plugins/ping/kdeconnect_ping.json
index 1d7d7e90b..9d22283ea 100644
--- a/plugins/ping/kdeconnect_ping.json
+++ b/plugins/ping/kdeconnect_ping.json
@@ -21,6 +21,7 @@
         "Description[es]": "Enviar y recibir pings",
         "Description[et]": "Pingide saatmine ja vastuvõtmine",
         "Description[fi]": "Lähetä ja vastaanota tiedustelupaketteja",
+        "Description[fr]": "Envoie et reçoit des commandes « Ping »",
         "Description[gl]": "Enviar e recibir pings.",
         "Description[hu]": "Pingek küldése és fogadása",
         "Description[it]": "Invia e ricevi ping",
@@ -48,6 +49,7 @@
         "License": "GPL",
         "Name": "Ping",
         "Name[fi]": "Tiedustelupaketti",
+        "Name[fr]": "Commande « Ping »",
         "Name[ko]": "핑",
         "Name[pt]": "Contacto",
         "Name[ru]": "Тестовый сигнал",
diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json
index f4d685b03..4b0db6413 100644
--- a/plugins/remotecommands/kdeconnect_remotecommands.json
+++ b/plugins/remotecommands/kdeconnect_remotecommands.json
@@ -21,6 +21,7 @@
         "Description[es]": "Desencadenar órdenes predefinidas en el dispositivo remoto",
         "Description[et]": "Kaugseadmes määratud käskude käivitamine",
         "Description[fi]": "Suorita ennakkoon määriteltyjä komentoja etälaitteella",
+        "Description[fr]": "Exécuter des commandes prédéfinies sur le périphérique distant",
         "Description[it]": "Innesca comandi predefiniti sul dispositivo remoto",
         "Description[ko]": "원격 장치에 미리 정의한 트리거 명령",
         "Description[nl]": "Start commando's voorgedefinieerd op het apparaat op afstand",
@@ -51,6 +52,7 @@
         "Name[es]": "Órdenes en servidor remoto",
         "Name[et]": "Kaugkäsud",
         "Name[fi]": "Etäkomennot",
+        "Name[fr]": "Exécuter des commandes distantes",
         "Name[it]": "Comandi remoti host",
         "Name[ko]": "호스트 원격 명령",
         "Name[nl]": "Commando's op afstand hosten",
diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json
index 63c6def0d..c2ac1538a 100644
--- a/plugins/remotecontrol/kdeconnect_remotecontrol.json
+++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json
@@ -21,6 +21,7 @@
         "Description[es]": "Controlar sistemas remotos",
         "Description[et]": "Kaugjuhtimissüsteemid",
         "Description[fi]": "Ohjaa järjestelmiä etänä",
+        "Description[fr]": "Controllez les systèmes distants",
         "Description[gl]": "Controla sistemas remotos.",
         "Description[it]": "Controlla i sistemi remoti",
         "Description[ko]": "원격 시스템 제어",
diff --git a/plugins/runcommand/kdeconnect_runcommand.json b/plugins/runcommand/kdeconnect_runcommand.json
index 6c6f19bff..dfafaf6c6 100644
--- a/plugins/runcommand/kdeconnect_runcommand.json
+++ b/plugins/runcommand/kdeconnect_runcommand.json
@@ -30,6 +30,7 @@
         "Description[es]": "Ejecute órdenes de consola remotamente",
         "Description[et]": "Konsoolikäskude kaugkäivitamine",
         "Description[fi]": "Suorita konsolikomentoja etänä",
+        "Description[fr]": "Exécute des commandes console à distance",
         "Description[it]": "Esegui da remoto comandi della console",
         "Description[ko]": "원격으로 콘솔 명령 실행",
         "Description[nl]": "Commando's in de terminal op afstand laten uitvoeren",
@@ -61,6 +62,7 @@
         "Name[es]": "Ejecutar órdenes",
         "Name[et]": "Käskude käivitamine",
         "Name[fi]": "Suorita komentoja",
+        "Name[fr]": "Exécute des commandes",
         "Name[it]": "Esegui comandi",
         "Name[ko]": "명령 실행",
         "Name[nl]": "Commando's uitvoeren",
diff --git a/plugins/runcommand/kdeconnect_runcommand_config.desktop b/plugins/runcommand/kdeconnect_runcommand_config.desktop
index 0736cc8af..a2e303c8e 100644
--- a/plugins/runcommand/kdeconnect_runcommand_config.desktop
+++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop
@@ -15,6 +15,7 @@ Name[en_GB]=Run Command plugin settings
 Name[es]=Ajustes del complemento de ejecución de órdenes
 Name[et]=Käsu käivitamise plugina seadistused
 Name[fi]=Suorita komento -liitännäisen asetukset
+Name[fr]=Configuration du module externe d'exécution de commande
 Name[it]=Impostazioni estensione Esegui comando
 Name[ko]=명령 실행 플러그인 설정
 Name[nl]=Plug-in-instellingen van commando Uitvoeren
diff --git a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
index 923b5bc44..631f447d6 100644
--- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
+++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
@@ -19,6 +19,7 @@
         "Description[es]": "Inhibir el salvapantallas cuando el dispositivo está conectado",
         "Description[et]": "Ekraanisäästja keelamine, kui seade on ühendatud",
         "Description[fi]": "Estä näytönsäästäjän käynnistyminen, kun laite on yhteydessä",
+        "Description[fr]": "Inhiber l'économiseur d'écran quand le périphérique est connecté",
         "Description[gl]": "Desactivar o salvapantallas mentres o dispositivo estea conectado.",
         "Description[hu]": "A képernyővédő kikapcsolása, ha az eszköz csatlakoztatva van",
         "Description[it]": "Impedisci il salvaschermo quando il dispositivo è connesso",
@@ -53,6 +54,7 @@
         "Name[es]": "Inhibir salvapantallas",
         "Name[et]": "Ekraanisäästja keelamine",
         "Name[fi]": "Estä näytönsäästäjän käynnistyminen",
+        "Name[fr]": "Inhiber l'économiseur d'écran",
         "Name[gl]": "Desactivar o salvapantallas",
         "Name[hu]": "Képernyővédő letiltása",
         "Name[it]": "Impedisci il salvaschermo",
diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications.json b/plugins/sendnotifications/kdeconnect_sendnotifications.json
index 97db5168b..9a2df3c88 100644
--- a/plugins/sendnotifications/kdeconnect_sendnotifications.json
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json
@@ -22,6 +22,7 @@
         "Description[es]": "Difundir las notificaciones de este equipo, para que puedan mostrarse en otros dispositivos.",
         "Description[et]": "Arvuti märguannete levitamine, et neid oleks näha ka teistes seadmetes",
         "Description[fi]": "Lähetä tämän tietokoneen ilmoitukset, jotta ne voidaan näyttää muilla laitteilla.",
+        "Description[fr]": "Diffuser les notifications de cet ordinateur pour qu'elles puissent être vues par d'autres périphériques.",
         "Description[it]": "Trasmetti le notifiche di questo computer, affinché possano essere mostrate su altri dispositivi.",
         "Description[ko]": "이 컴퓨터의 알림을 다른 장치에도 표시합니다.",
         "Description[nl]": "De meldingen van deze computer rondsturen, zodat ze op andere apparaten getoond kunnen worden.",
@@ -53,6 +54,7 @@
         "Name[es]": "Enviar notificaciones",
         "Name[et]": "Märguannete saatmine",
         "Name[fi]": "Lähetä ilmoituksia",
+        "Name[fr]": "Envoyer les notifications",
         "Name[it]": "Invia notifiche",
         "Name[ko]": "알림 보내기",
         "Name[nl]": "Stuur meldingen",
diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
index fd4aedaf9..19e041a22 100644
--- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
@@ -15,6 +15,7 @@ Name[en_GB]=Notification synchronisation plugin settings
 Name[es]=Preferencias del complemento de sincronización de notificaciones
 Name[et]=Märguande sünkroonimise plugina seaditused
 Name[fi]=Ilmoitusten synkronointiliitännäisen asetukset
+Name[fr]=Configuration du module externe de synchronisation des notifications
 Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche
 Name[ko]=알림 동기화 플러그인 설정
 Name[nl]=Instellingen voor meldingen van synchronisatie plug-in
diff --git a/plugins/sftp/kdeconnect_sftp.json b/plugins/sftp/kdeconnect_sftp.json
index edb5e66b4..1d7695f33 100644
--- a/plugins/sftp/kdeconnect_sftp.json
+++ b/plugins/sftp/kdeconnect_sftp.json
@@ -23,6 +23,7 @@
         "Description[es]": "Navegar por el sistema de archivos del dispositivo remoto usando SFTP",
         "Description[et]": "Oma seadme failisüsteemi sirvimine SFTP vahendusel",
         "Description[fi]": "Selaa etälaitteiden tiedostojärjestelmiä SFTP:llä",
+        "Description[fr]": "Naviguer dans le système de fichiers du périphérique distant en utilisant SFTP",
         "Description[gl]": "Explore o sistema de ficheiros do dispositivo remoto mediante SFTP.",
         "Description[hu]": "Távoli fájlrendszerek böngészése SFTP-n keresztül",
         "Description[it]": "Sfoglia il filesystem del dispositivo remoto utilizzando SFTP",
@@ -57,6 +58,7 @@
         "Name[es]": "Navegador de sistema de archivos remoto",
         "Name[et]": "Kaug-failisüsteemi sirvija",
         "Name[fi]": "Etätiedostojärjestelmäselain",
+        "Name[fr]": "Explorateur à distance du système de fichiers",
         "Name[gl]": "Navegador do sistema de ficheiros remoto.",
         "Name[hu]": "Távoli fájlrendszer-böngésző",
         "Name[it]": "Navigazione del filesystem remoto",
diff --git a/plugins/share/kdeconnect_share.json b/plugins/share/kdeconnect_share.json
index 8ce1aa289..d1d879ca8 100644
--- a/plugins/share/kdeconnect_share.json
+++ b/plugins/share/kdeconnect_share.json
@@ -21,6 +21,7 @@
         "Description[es]": "Recibir y enviar archivos, URL o texto sin formato fácilmente",
         "Description[et]": "Failide, URL-ide või lihtteksti hõlpus vastuvõtmine ja saatmine",
         "Description[fi]": "Vastaanota ja lähetä tiedostoja, verkko-osoitteita tai tekstiä helposti",
+        "Description[fr]": "Recevoir et envoyer des fichiers, des URLs ou du texte brut facilement",
         "Description[gl]": "Comparta e reciba con facilidade ficheiros, enderezos URL ou texto simple.",
         "Description[hu]": "Fájlok, URL-ek és szöveg fogadása és küldése",
         "Description[it]": "Ricevi e invia facilmente file, URL o testo semplice",
@@ -55,6 +56,7 @@
         "Name[es]": "Compartir y recibir",
         "Name[et]": "Jagamine ja vastuvõtmine",
         "Name[fi]": "Jaa ja vastaanota",
+        "Name[fr]": "Partager et recevoir",
         "Name[gl]": "Compartir e recibir.",
         "Name[hu]": "Megosztás és fogadás",
         "Name[it]": "Condividi e ricevi",
diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json
index 01856565b..f3a8d0b9c 100644
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@@ -21,6 +21,7 @@
         "Description[es]": "Mostrar notificaciones de llamadas y SMS",
         "Description[et]": "Kõnede ja SMS-ide märguannete näitamine",
         "Description[fi]": "Näytä puhelujen ja tekstiviestien ilmoitukset",
+        "Description[fr]": "Affichez les notifications pour les appels et les SMS",
         "Description[it]": "Mostra notifiche per le chiamate e per gli SMS",
         "Description[ko]": "통화와 SMS 알림 표시",
         "Description[nl]": "Meldingen tonen van oproepen en SMSjes",
@@ -52,6 +53,7 @@
         "Name[es]": "Integración con el teléfono",
         "Name[et]": "Telefoniga lõimimine",
         "Name[fi]": "Puhelinintegrointi",
+        "Name[fr]": "Intégration de la téléphonie",
         "Name[gl]": "Integración telefónica",
         "Name[hu]": "Telefonintegráció",
         "Name[it]": "Integrazione telefonica",

From ef1bee54e0ac05bc3203e78cea36c6dfb1d945d8 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 20 Jun 2017 05:46:09 +0200
Subject: [PATCH 4/5] 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/kdeconnect.desktop                       | 2 +-
 fileitemactionplugin/kdeconnectsendfile.desktop | 2 +-
 kcm/kcm_kdeconnect.desktop                      | 2 +-
 kcm/org.kde.kdeconnect.kcm.desktop              | 2 +-
 plasmoid/package/metadata.desktop               | 4 ++--
 plugins/kdeconnect.notifyrc                     | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
index c5a3ca518..edcbc49ce 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -26,7 +26,7 @@ Name[sr@ijekavian]=КДЕ‑конекцијин програм
 Name[sr@ijekavianlatin]=KDE‑konekcijin program
 Name[sr@latin]=KDE‑konekcijin program
 Name[sv]=Programmet KDE-anslut
-Name[tr]=KDE Bağlantı Uygulaması
+Name[tr]=KDE Connect Uygulaması
 Name[uk]=Програма KDE Connect
 Name[x-test]=xxKDE Connect Applicationxx
 Name[zh_CN]=KDE Connect 应用程序
diff --git a/daemon/kdeconnect.desktop b/daemon/kdeconnect.desktop
index f22a936d0..d1257e5c7 100644
--- a/daemon/kdeconnect.desktop
+++ b/daemon/kdeconnect.desktop
@@ -39,7 +39,7 @@ Name[sr@ijekavian]=КДЕ‑конекција
 Name[sr@ijekavianlatin]=KDE‑konekcija
 Name[sr@latin]=KDE‑konekcija
 Name[sv]=KDE-anslut
-Name[tr]=KDE Bağlan
+Name[tr]=KDE Connect
 Name[uk]=З’єднання KDE
 Name[x-test]=xxKDE Connectxx
 Name[zh_CN]=KDE Connect
diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop
index e3806ca42..7e92ba2d2 100644
--- a/fileitemactionplugin/kdeconnectsendfile.desktop
+++ b/fileitemactionplugin/kdeconnectsendfile.desktop
@@ -29,7 +29,7 @@ Name[sr@ijekavian]=Шаљи фајл преко КДЕ‑конекцијино
 Name[sr@ijekavianlatin]=Šalji fajl preko KDE‑konekcijinog servisa
 Name[sr@latin]=Šalji fajl preko KDE‑konekcijinog servisa
 Name[sv]=Skicka fil via KDE:s anslutningstjänst
-Name[tr]=KDE Bağlantı servisi ile dosya gönderin
+Name[tr]=KDE Connect servisi ile dosya gönderin
 Name[uk]=Надсилання файла за допомогою служби з’єднання KDE
 Name[x-test]=xxSend file via KDE Connect servicexx
 Name[zh_CN]=通过 KDE Connect 服务发送文件
diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop
index 579458dfc..2548d2297 100755
--- a/kcm/kcm_kdeconnect.desktop
+++ b/kcm/kcm_kdeconnect.desktop
@@ -40,7 +40,7 @@ Name[sr@ijekavian]=КДЕ‑конекција
 Name[sr@ijekavianlatin]=KDE‑konekcija
 Name[sr@latin]=KDE‑konekcija
 Name[sv]=KDE-anslut
-Name[tr]=KDE Bağlan
+Name[tr]=KDE Connect
 Name[uk]=З’єднання KDE
 Name[x-test]=xxKDE Connectxx
 Name[zh_CN]=KDE Connect
diff --git a/kcm/org.kde.kdeconnect.kcm.desktop b/kcm/org.kde.kdeconnect.kcm.desktop
index 463211bd6..9f9edf0ab 100755
--- a/kcm/org.kde.kdeconnect.kcm.desktop
+++ b/kcm/org.kde.kdeconnect.kcm.desktop
@@ -30,7 +30,7 @@ Name[sr@ijekavian]=Поставке за КДЕ‑конекцију
 Name[sr@ijekavianlatin]=Postavke za KDE‑konekciju
 Name[sr@latin]=Postavke za KDE‑konekciju
 Name[sv]=Inställning av KDE-anslut
-Name[tr]=KDE Bağlantı Ayarları
+Name[tr]=KDE Connect Ayarları
 Name[uk]=Параметри KDE Connect
 Name[x-test]=xxKDE Connect Settingsxx
 Name[zh_CN]=KDE Connect 设置
diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop
index 6108624ed..05fe40f12 100644
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@@ -29,7 +29,7 @@ Name[sr@ijekavian]=КДЕ‑конекција
 Name[sr@ijekavianlatin]=KDE‑konekcija
 Name[sr@latin]=KDE‑konekcija
 Name[sv]=KDE-anslut
-Name[tr]=KDE Bağlan
+Name[tr]=KDE Connect
 Name[uk]=З’єднання KDE
 Name[x-test]=xxKDE Connectxx
 Name[zh_CN]=KDE Connect
@@ -63,7 +63,7 @@ Comment[sr@ijekavian]=Приказује обавештења са вашег у
 Comment[sr@ijekavianlatin]=Prikazuje obaveštenja sa vašeg uređaja pomoću KDE‑konekcije
 Comment[sr@latin]=Prikazuje obaveštenja sa vašeg uređaja pomoću KDE‑konekcije
 Comment[sv]=Visa underrättelser från apparater med KDE anslut
-Comment[tr]=KDE Bağlan kullanılarak cihazınızdan bildirimleri görüntüleyin
+Comment[tr]=KDE Connect kullanılarak cihazınızdan bildirimleri görüntüleyin
 Comment[uk]=Показ сповіщень з ваших пристроїв за допомогою програми «З’єднання KDE»
 Comment[x-test]=xxShow notifications from your devices using KDE Connectxx
 Comment[zh_CN]=通过 KDE Connect 显示来自您的设备的通知
diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index 904a24652..54654ef3d 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -30,7 +30,7 @@ Name[sr@ijekavian]=КДЕ‑конекција
 Name[sr@ijekavianlatin]=KDE‑konekcija
 Name[sr@latin]=KDE‑konekcija
 Name[sv]=KDE-anslut
-Name[tr]=KDE Bağlan
+Name[tr]=KDE Connect
 Name[uk]=З’єднання KDE
 Name[x-test]=xxKDE Connectxx
 Name[zh_CN]=KDE Connect

From 5641d818dc6875edf82b1b4e91d861997c3ecfc1 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Wed, 12 Jul 2017 10:51:09 +0200
Subject: [PATCH 5/5] Treat device names as plaintext, not rich text

Summary:
Notifications, QML Text and QLabel accept a HTML subset,
which does not make sense for device names.

BUG: 382243

Test Plan:
Sent a pair request and accepted it, device name
now shown as plain text everywhere.

Reviewers: #kde_connect, albertvaka

Reviewed By: #kde_connect, albertvaka

Subscribers: #kde_connect

Differential Revision: https://phabricator.kde.org/D6640
---
 daemon/kdeconnectd.cpp                          | 2 +-
 kcm/kcm.ui                                      | 3 +++
 plasmoid/package/contents/ui/DeviceDelegate.qml | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/daemon/kdeconnectd.cpp b/daemon/kdeconnectd.cpp
index 0f242c7b8..696babeef 100644
--- a/daemon/kdeconnectd.cpp
+++ b/daemon/kdeconnectd.cpp
@@ -46,7 +46,7 @@ public:
         KNotification* notification = new KNotification(QStringLiteral("pairingRequest"));
         notification->setIconName(QStringLiteral("dialog-information"));
         notification->setComponentName(QStringLiteral("kdeconnect"));
-        notification->setText(i18n("Pairing request from %1", getDevice(d->deviceLink()->deviceId())->name()));
+        notification->setText(i18n("Pairing request from %1", getDevice(d->deviceLink()->deviceId())->name()).toHtmlEscaped());
         notification->setActions(QStringList() << i18n("Accept") << i18n("Reject"));
         connect(notification, &KNotification::ignored, d, &PairingHandler::rejectPairing);
         connect(notification, &KNotification::action1Activated, d, &PairingHandler::acceptPairing);
diff --git a/kcm/kcm.ui b/kcm/kcm.ui
index a58569e04..a533cb3da 100644
--- a/kcm/kcm.ui
+++ b/kcm/kcm.ui
@@ -156,6 +156,9 @@
               <property name="text">
                <string>Device</string>
               </property>
+              <property name="textFormat">
+               <enum>Qt::PlainText</enum>
+              </property>
              </widget>
             </item>
             <item>
diff --git a/plasmoid/package/contents/ui/DeviceDelegate.qml b/plasmoid/package/contents/ui/DeviceDelegate.qml
index e90e021a6..15b124aa9 100644
--- a/plasmoid/package/contents/ui/DeviceDelegate.qml
+++ b/plasmoid/package/contents/ui/DeviceDelegate.qml
@@ -44,6 +44,7 @@ PlasmaComponents.ListItem
                 elide: Text.ElideRight
                 text: display
                 Layout.fillWidth: true
+                textFormat: Text.PlainText
             }
 
             //Find my phone