From 7a14a0ef4d700277b34e3f8896540ed3797a89c7 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 12 May 2017 05:44:57 +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"
---
 kcmkwin/kwincompositing/kwineffect.knsrc       | 1 +
 kcmkwin/kwinscripts/kwinscripts.knsrc          | 1 +
 kcmkwin/kwintabbox/kwinswitcher.knsrc          | 1 +
 plugins/kdecorations/aurorae/src/aurorae.knsrc | 1 +
 4 files changed, 4 insertions(+)

diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc
index a46a2607d8..d12f5f7273 100644
--- a/kcmkwin/kwincompositing/kwineffect.knsrc
+++ b/kcmkwin/kwincompositing/kwineffect.knsrc
@@ -9,6 +9,7 @@ Name[el]=Εφέ διαχειριστή παραθύρων
 Name[en_GB]=Window Manager Effects
 Name[es]=Efectos del gestor de ventanas
 Name[fi]=Ikkunaohjelman tehosteet
+Name[fr]=Effets du gestionnaire de fenêtres
 Name[hu]=Ablakkezelő-effektusok
 Name[ia]=Gerente de effectos de fenestra
 Name[it]=Effetti del gestore delle finestre
diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc
index c9163869f8..1e3d9657dc 100644
--- a/kcmkwin/kwinscripts/kwinscripts.knsrc
+++ b/kcmkwin/kwinscripts/kwinscripts.knsrc
@@ -9,6 +9,7 @@ Name[el]=Σενάρια διαχειριστή παραθύρων
 Name[en_GB]=Window Manager Scripts
 Name[es]=Guiones del gestor de ventanas
 Name[fi]=Ikkunaohjelman skriptit
+Name[fr]=Scripts du gestionnaire de fenêtres
 Name[hu]=Ablakkezelő szkriptek
 Name[ia]=Gerente de scripts de fenestra 
 Name[it]=Script del gestore delle finestre
diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc
index 0c9db7c5e2..c46821aaf3 100644
--- a/kcmkwin/kwintabbox/kwinswitcher.knsrc
+++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc
@@ -9,6 +9,7 @@ Name[el]=Διατάξεις εναλλαγής διαχειριστή παραθ
 Name[en_GB]=Window Manager Switching Layouts
 Name[es]=Esquemas de cambio del gestor de ventanas
 Name[fi]=Ikkunaohjelman vaihdon asettelut
+Name[fr]=Changement de disposition du gestionnaire de fenêtres
 Name[hu]=Ablakkezelő-váltó elrendezések
 Name[ia]=Disposition de commutator de gerente de fenestra
 Name[it]=Disposizione scambiafinestre del gestore delle finestre
diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc
index 29c59e6ee1..8e5fa485d2 100644
--- a/plugins/kdecorations/aurorae/src/aurorae.knsrc
+++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc
@@ -9,6 +9,7 @@ Name[el]=Διακοσμήσεις παραθύρου Aurorae
 Name[en_GB]=Aurorae Window Decorations
 Name[es]=Decoración de ventanas Aurorae
 Name[fi]=Aurorae-ikkunakoristeet
+Name[fr]=Décorations de fenêtres Aurorae
 Name[hu]=Aurorae ablakdekorációk
 Name[ia]=Decorationes de fenestra Aurorae
 Name[it]=Decorazioni delle finestre Aurorae