From c6dc3ed2cd564aaa1496574bc5e54b716f46cacf Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 10 Jun 2017 06:00:45 +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/kwindecoration/kwindecoration.desktop           | 2 +-
 plugins/kdecorations/aurorae/src/kwindecoration.desktop | 2 +-
 scripts/enforcedeco/metadata.desktop                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop
index b8490f3faf..e9de18597c 100644
--- a/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kcmkwin/kwindecoration/kwindecoration.desktop
@@ -26,7 +26,7 @@ Name[en_GB]=Window Decorations
 Name[es]=Decoración de ventanas
 Name[et]=Akna dekoratsioonid
 Name[eu]=Leiho-apaindurak
-Name[fi]=Ikkunoiden kehykset
+Name[fi]=Ikkunakehykset
 Name[fr]=Décorations de fenêtres
 Name[ga]=Maisiúcháin Fhuinneog
 Name[gl]=Decoración da xanela
diff --git a/plugins/kdecorations/aurorae/src/kwindecoration.desktop b/plugins/kdecorations/aurorae/src/kwindecoration.desktop
index f3f29e3ce2..8fcf780b55 100644
--- a/plugins/kdecorations/aurorae/src/kwindecoration.desktop
+++ b/plugins/kdecorations/aurorae/src/kwindecoration.desktop
@@ -15,7 +15,7 @@ Comment[en_GB]=KWin Window Decoration
 Comment[es]=Decoración de ventanas de KWin
 Comment[et]=KWini akna dekoratsioon
 Comment[eu]=KWin leihoen apainketa
-Comment[fi]=KWin-ikkunan kehys
+Comment[fi]=KWin-ikkunakehys
 Comment[fr]=Décorations de fenêtres KWin
 Comment[ga]=Maisiúchán Fuinneog KWin
 Comment[gl]=Decoración de xanela de Kwin
diff --git a/scripts/enforcedeco/metadata.desktop b/scripts/enforcedeco/metadata.desktop
index 50bc6e657c..ed61f015b5 100644
--- a/scripts/enforcedeco/metadata.desktop
+++ b/scripts/enforcedeco/metadata.desktop
@@ -11,7 +11,7 @@ Name[en_GB]=Enforces Window Decorations on GTK+ window
 Name[es]=Fuerza decoraciones en las ventanas de GTK+
 Name[et]=Akna dekoratsioonide kehtestamine GTK+ aknas
 Name[eu]=GTK+ leihoengan leiho-apaingarriak behartzen ditu
-Name[fi]=Pakottaa ikkunoiden kehykset GTK+-ikkunoille
+Name[fi]=Pakottaa GTK+-ikkunoiden ikkunakehykset
 Name[fr]=Forcer les décorations de fenêtres avec les fenêtres GTK+
 Name[gl]=Aplica a decoración ás xanelas de GTK+
 Name[he]=אכוף עיצוב מסגרת חלון לחלונות GTK