From 8d0939f7fccdcc1eb8b62e4170b67102b219273f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 3 Apr 2017 05:14:56 +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 +
 packageplugins/scripts/kwin-packagestructure-scripts.desktop     | 1 +
 .../windowswitcher/kwin-packagestructure-windowswitcher.desktop  | 1 +
 plugins/kdecorations/aurorae/src/aurorae.knsrc                   | 1 +
 6 files changed, 6 insertions(+)

diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc
index 1ae1936a1c..1fc3276a21 100644
--- a/kcmkwin/kwincompositing/kwineffect.knsrc
+++ b/kcmkwin/kwincompositing/kwineffect.knsrc
@@ -3,6 +3,7 @@ Name=Window Manager Effects
 Name[ca]=Efectes del gestor de finestres
 Name[ca@valencia]=Efectes del gestor de finestres
 Name[de]=Fensterverwaltungs-Effekte
+Name[es]=Efectos del gestor de ventanas
 Name[it]=Effetti del gestore delle finestre
 Name[pt]=Efeitos do Gestor de Janelas
 Name[sv]=Fönsterhanteringseffekter
diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc
index 4dc8757042..91ab942289 100644
--- a/kcmkwin/kwinscripts/kwinscripts.knsrc
+++ b/kcmkwin/kwinscripts/kwinscripts.knsrc
@@ -3,6 +3,7 @@ Name=Window Manager Scripts
 Name[ca]=Scripts del gestor de finestres
 Name[ca@valencia]=Scripts del gestor de finestres
 Name[de]=Fensterverwaltungs-Skripte
+Name[es]=Guiones del gestor de ventanas
 Name[it]=Script del gestore delle finestre
 Name[pt]=Programas do Gestor de Janelas
 Name[sv]=Fönsterhanteringsskript
diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc
index 8086369ccc..eb278be108 100644
--- a/kcmkwin/kwintabbox/kwinswitcher.knsrc
+++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc
@@ -3,6 +3,7 @@ Name=Window Manager Switching Layouts
 Name[ca]=Disposicions del commutador del gestor de finestres
 Name[ca@valencia]=Disposicions del commutador del gestor de finestres
 Name[de]=Wechsel-Layout für Fensterverwaltung
+Name[es]=Esquemas de cambio del gestor de ventanas
 Name[it]=Disposizione scambiafinestre del gestore delle finestre
 Name[pt]=Disposições de Mudança do Gestor de Janelas
 Name[sv]=Fönsterbyteslayouter
diff --git a/packageplugins/scripts/kwin-packagestructure-scripts.desktop b/packageplugins/scripts/kwin-packagestructure-scripts.desktop
index ae420a4043..8b6d5cc6eb 100644
--- a/packageplugins/scripts/kwin-packagestructure-scripts.desktop
+++ b/packageplugins/scripts/kwin-packagestructure-scripts.desktop
@@ -3,6 +3,7 @@ Name=KWin Script
 Name[ca]=Script del KWin
 Name[ca@valencia]=Script del KWin
 Name[de]=KWin-Skript
+Name[es]=Guion de KWin
 Name[it]=Script di KWin
 Name[pt]=Programa do KWin
 Name[sv]=Kwin-skript
diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
index a9e5073bcb..000e8d91f7 100644
--- a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
+++ b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
@@ -3,6 +3,7 @@ Name=KWin Window Switcher
 Name[ca]=Commutador de finestres del KWin
 Name[ca@valencia]=Commutador de finestres del KWin
 Name[de]=KWin-Fensterwechsler
+Name[es]=Cambiador de ventanas de KWin
 Name[it]=Scambiafinestre di KWin
 Name[pt]=Mudança de Janelas do KWin
 Name[sv]=Kwin-fönsterbyte
diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc
index 5314ce8169..e566e44ac4 100644
--- a/plugins/kdecorations/aurorae/src/aurorae.knsrc
+++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc
@@ -3,6 +3,7 @@ Name=Aurorae Window Decorations
 Name[ca]=Decoracions de finestra Aurorae
 Name[ca@valencia]=Decoracions de finestra Aurorae
 Name[de]=Aurorae-Fensterdekoration
+Name[es]=Decoraciones de ventanas Aurorae
 Name[it]=Decorazioni delle finestre Aurorae
 Name[pt]=Decorações das Janelas do Aurorae
 Name[sv]=Aurora-fönsterdekorationer