From 9ad87d3909fd0cde76c67c34f2e38d5c3c6e662f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 10 May 2017 07:42:38 +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"
---
 effects/logout/package/metadata.desktop                          | 1 +
 kcmkwin/kwincompositing/kwineffect.knsrc                         | 1 +
 kcmkwin/kwinscripts/kwinscripts.knsrc                            | 1 +
 kcmkwin/kwintabbox/kwinswitcher.knsrc                            | 1 +
 packageplugins/aurorae/kwin-packagestructure-aurorae.desktop     | 1 +
 .../decoration/kwin-packagestructure-decoration.desktop          | 1 +
 plugins/kdecorations/aurorae/src/aurorae.knsrc                   | 1 +
 7 files changed, 7 insertions(+)

diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop
index 8e7ef64030..482304aff4 100644
--- a/effects/logout/package/metadata.desktop
+++ b/effects/logout/package/metadata.desktop
@@ -3,6 +3,7 @@ Name=logout
 Name[ca]=sortida
 Name[ca@valencia]=eixida
 Name[cs]=odhlášení
+Name[de]=Abmeldung
 Name[el]=αποσύνδεση
 Name[es]=cerrar la sesión
 Name[hu]=Kijelentkezés
diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc
index c9d5046404..a46a2607d8 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[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 f756699cb7..c9163869f8 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[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 fdef9e503c..0c9db7c5e2 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[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/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop
index 8c324c73a6..e53fcd41a9 100644
--- a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop
+++ b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop
@@ -3,6 +3,7 @@ Name=KWin Aurorae
 Name[ca]=Aurorae del KWin
 Name[ca@valencia]=Aurorae del KWin
 Name[cs]=KWin Aurorae
+Name[de]=KWin Aurorae
 Name[el]=KWin Aurorae
 Name[es]=Aurorae de KWin
 Name[hu]=KWin Aurorae
diff --git a/packageplugins/decoration/kwin-packagestructure-decoration.desktop b/packageplugins/decoration/kwin-packagestructure-decoration.desktop
index c764628b79..ab86ef3c64 100644
--- a/packageplugins/decoration/kwin-packagestructure-decoration.desktop
+++ b/packageplugins/decoration/kwin-packagestructure-decoration.desktop
@@ -3,6 +3,7 @@ Name=KWin Decoration
 Name[ca]=Decoració del KWin
 Name[ca@valencia]=Decoració del KWin
 Name[cs]=Dekorace KWin
+Name[de]=KWin-Dekoration
 Name[el]=Διακοσμήσεις KWin
 Name[es]=Decoración de KWin
 Name[hu]=KWin dekoráció
diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc
index 499badf187..29c59e6ee1 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[hu]=Aurorae ablakdekorációk
 Name[ia]=Decorationes de fenestra Aurorae
 Name[it]=Decorazioni delle finestre Aurorae