From 770332dbac840a54e46b0261cb6a8723c08fd963 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 25 Feb 2018 05:32:33 +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"
---
 kcmkwin/kwincompositing/kwineffect.knsrc | 2 +-
 kcmkwin/kwinscripts/kwinscripts.knsrc    | 2 +-
 kcmkwin/kwintabbox/kwinswitcher.knsrc    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc
index 4d80e93e77..c60d424b4b 100644
--- a/kcmkwin/kwincompositing/kwineffect.knsrc
+++ b/kcmkwin/kwincompositing/kwineffect.knsrc
@@ -9,7 +9,7 @@ Name[el]=Εφέ διαχειριστή παραθύρων
 Name[en_GB]=Window Manager Effects
 Name[es]=Efectos del gestor de ventanas
 Name[eu]=Leiho kudeatzailearen efektua
-Name[fi]=Ikkunaohjelman tehosteet
+Name[fi]=Ikkunointiohjelman tehosteet
 Name[fr]=Effets du gestionnaire de fenêtres
 Name[gl]=Efectos do xestor de xanelas
 Name[he]=אפקטי מנהל חלונות
diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc
index 3ef48b41e6..ccc8bfadfe 100644
--- a/kcmkwin/kwinscripts/kwinscripts.knsrc
+++ b/kcmkwin/kwinscripts/kwinscripts.knsrc
@@ -9,7 +9,7 @@ Name[el]=Σενάρια διαχειριστή παραθύρων
 Name[en_GB]=Window Manager Scripts
 Name[es]=Guiones del gestor de ventanas
 Name[eu]=Leiho kudeatzailearen scriptak
-Name[fi]=Ikkunaohjelman skriptit
+Name[fi]=Ikkunointiohjelman skriptit
 Name[fr]=Scripts du gestionnaire de fenêtres
 Name[gl]=Scripts do xestor de xanelas
 Name[hu]=Ablakkezelő szkriptek
diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc
index 2b2cc34d24..97018f5204 100644
--- a/kcmkwin/kwintabbox/kwinswitcher.knsrc
+++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc
@@ -9,7 +9,7 @@ Name[el]=Διατάξεις εναλλαγής διαχειριστή παραθ
 Name[en_GB]=Window Manager Switching Layouts
 Name[es]=Esquemas de cambio del gestor de ventanas
 Name[eu]=Leiho kudeatzailearen aldatzeko-antolamenduak
-Name[fi]=Ikkunaohjelman vaihdon asettelut
+Name[fi]=Ikkunointiohjelman vaihdon asettelut
 Name[fr]=Changement de disposition du gestionnaire de fenêtres
 Name[gl]=Disposicións de cambio do xestor de xanelas
 Name[he]=מחליף פריסות של מנהל החלונות