From 52b21b1142ddeda1bdb901e3c79c5bda8b3054f3 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 10 May 2017 08:51:09 +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 95412f1724..388f664609 100644
--- a/kcmkwin/kwincompositing/kwineffect.knsrc
+++ b/kcmkwin/kwincompositing/kwineffect.knsrc
@@ -8,6 +8,7 @@ Name[de]=Fensterverwaltungs-Effekte
 Name[el]=Εφέ διαχειριστή παραθύρων
 Name[en_GB]=Window Manager Effects
 Name[es]=Efectos del gestor de ventanas
+Name[fi]=Ikkunaohjelman tehosteet
 Name[ia]=Gerente de effectos de fenestra
 Name[it]=Effetti del gestore delle finestre
 Name[ko]=창 관리자 효과
diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc
index 664f8ef5c3..c525626ad1 100644
--- a/kcmkwin/kwinscripts/kwinscripts.knsrc
+++ b/kcmkwin/kwinscripts/kwinscripts.knsrc
@@ -8,6 +8,7 @@ Name[de]=Fensterverwaltungs-Skripte
 Name[el]=Σενάρια διαχειριστή παραθύρων
 Name[en_GB]=Window Manager Scripts
 Name[es]=Guiones del gestor de ventanas
+Name[fi]=Ikkunaohjelman skriptit
 Name[ia]=Gerente de scripts de fenestra 
 Name[it]=Script del gestore delle finestre
 Name[ko]=창 관리자 스크립트
diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc
index 737584b822..885753c941 100644
--- a/kcmkwin/kwintabbox/kwinswitcher.knsrc
+++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc
@@ -8,6 +8,7 @@ Name[de]=Wechsel-Layout für Fensterverwaltung
 Name[el]=Διατάξεις εναλλαγής διαχειριστή παραθύρων
 Name[en_GB]=Window Manager Switching Layouts
 Name[es]=Esquemas de cambio del gestor de ventanas
+Name[fi]=Ikkunaohjelman vaihdon asettelut
 Name[ia]=Disposition de commutator de gerente de fenestra
 Name[it]=Disposizione scambiafinestre del gestore delle finestre
 Name[ko]=창 관리자 전환기 레이아웃
diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc
index d071a77cfd..04f56d1fdd 100644
--- a/plugins/kdecorations/aurorae/src/aurorae.knsrc
+++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc
@@ -8,6 +8,7 @@ Name[de]=Aurorae-Fensterdekoration
 Name[el]=Διακοσμήσεις παραθύρου Aurorae
 Name[en_GB]=Aurorae Window Decorations
 Name[es]=Decoración de ventanas Aurorae
+Name[fi]=Aurorae-ikkunakoristeet
 Name[ia]=Decorationes de fenestra Aurorae
 Name[it]=Decorazioni delle finestre Aurorae
 Name[ko]=Aurorae 창 장식