From c070b4d445b5b835d1225e1f06cf0b76193cf54e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 4 Jun 2017 04:17:49 +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                 | 3 +++
 kcm/org.kde.kdeconnect.kcm.desktop                             | 1 +
 plugins/kdeconnect.notifyrc                                    | 3 ++-
 plugins/runcommand/kdeconnect_runcommand_config.desktop        | 1 +
 .../kdeconnect_sendnotifications_config.desktop                | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/indicator/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop
index bd6057575..1eba49746 100755
--- a/indicator/org.kde.kdeconnect.nonplasma.desktop
+++ b/indicator/org.kde.kdeconnect.nonplasma.desktop
@@ -3,7 +3,9 @@ Name=KDE Connect Indicator
 Name[ca]=Indicador del KDE Connect
 Name[ca@valencia]=Indicador del KDE Connect
 Name[de]=KDE-Connect-Anzeige
+Name[fr]=Indicateur de KDE Connect
 Name[nl]=KDE-Connect indicator
+Name[pl]=Wskaźnik KDE Connect
 Name[pt]=Indicador do KDE Connect
 Name[sv]=KDE-anslut indikator
 Name[uk]=Індикатор KDE Connect
@@ -21,6 +23,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[he]=הצג מידע עך ההתקנים שלך
 Comment[hu]=Információk megjelenítése az eszközeiről
diff --git a/kcm/org.kde.kdeconnect.kcm.desktop b/kcm/org.kde.kdeconnect.kcm.desktop
index e7f6b2669..591e173e7 100755
--- a/kcm/org.kde.kdeconnect.kcm.desktop
+++ b/kcm/org.kde.kdeconnect.kcm.desktop
@@ -16,6 +16,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]=Configuration de KDE Connect
 Name[gl]=Configuración de KDE Connect
 Name[he]=הגדרות KDE Connect 
 Name[hu]=A KDE Connect beállításai
diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index 7b0be97a3..cbe6b1ad0 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -95,7 +95,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[he]=בקשת התאמה
 Name[hu]=Párosítási kérés
@@ -131,6 +131,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[gl]=Recibiuse unha solicitude de emparellamento dun dispositivo.
 Comment[he]=התקבלה בקשת התאמה מהתקן
 Comment[it]=Richiesta di associazione ricevuta da un dispositivo
diff --git a/plugins/runcommand/kdeconnect_runcommand_config.desktop b/plugins/runcommand/kdeconnect_runcommand_config.desktop
index 240bad119..161dedee5 100644
--- a/plugins/runcommand/kdeconnect_runcommand_config.desktop
+++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop
@@ -18,6 +18,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[gl]=Configuración do complemento de orde de executar
 Name[he]=הגדרת התוסף הרץ פקודה
 Name[it]=Impostazioni estensione Esegui comando
diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
index 6b2f71cc4..1d06f462f 100644
--- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
@@ -18,6 +18,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[gl]=Configuración do complemento de sincronización de notificacións
 Name[he]=הגדרת התוסף סנכרון התראות
 Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche