From e534d5abad3fe34c864b5d7289db18694f08e5ab Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 26 Sep 2020 05:57:20 +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 +-
 kcmkwin/kwindecoration/package/metadata.desktop         | 2 +-
 kcmkwin/kwindecoration/window-decorations.knsrc         | 2 +-
 plugins/kdecorations/aurorae/src/aurorae.knsrc          | 2 +-
 plugins/kdecorations/aurorae/src/kwindecoration.desktop | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop
index 694a79a75..4001ef580 100644
--- a/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kcmkwin/kwindecoration/kwindecoration.desktop
@@ -25,7 +25,7 @@ Name[da]=Vinduesdekorationer
 Name[de]=Fensterdekoration
 Name[el]=Διακοσμήσεις παραθύρου
 Name[en_GB]=Window Decorations
-Name[es]=Decoración de ventanas
+Name[es]=Decoraciones de las ventanas
 Name[et]=Akna dekoratsioonid
 Name[eu]=Leiho-apaindurak
 Name[fi]=Ikkunakehykset
diff --git a/kcmkwin/kwindecoration/package/metadata.desktop b/kcmkwin/kwindecoration/package/metadata.desktop
index 44ea92bd3..e14627705 100644
--- a/kcmkwin/kwindecoration/package/metadata.desktop
+++ b/kcmkwin/kwindecoration/package/metadata.desktop
@@ -27,7 +27,7 @@ Name[da]=Vinduesdekorationer
 Name[de]=Fensterdekoration
 Name[el]=Διακοσμήσεις παραθύρου
 Name[en_GB]=Window Decorations
-Name[es]=Decoración de ventanas
+Name[es]=Decoraciones de las ventanas
 Name[et]=Akna dekoratsioonid
 Name[eu]=Leiho-apaindurak
 Name[fi]=Ikkunakehykset
diff --git a/kcmkwin/kwindecoration/window-decorations.knsrc b/kcmkwin/kwindecoration/window-decorations.knsrc
index 68061263a..95b31634e 100644
--- a/kcmkwin/kwindecoration/window-decorations.knsrc
+++ b/kcmkwin/kwindecoration/window-decorations.knsrc
@@ -11,7 +11,7 @@ Name[da]=Vinduesdekorationer
 Name[de]=Fensterdekoration
 Name[el]=Διακοσμήσεις παραθύρου
 Name[en_GB]=Window Decorations
-Name[es]=Decoración de ventanas
+Name[es]=Decoraciones de las ventanas
 Name[et]=Akna dekoratsioonid
 Name[eu]=Leiho-apaindurak
 Name[fi]=Ikkunakehykset
diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc
index 357cde3d4..c94cad403 100644
--- a/plugins/kdecorations/aurorae/src/aurorae.knsrc
+++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc
@@ -8,7 +8,7 @@ Name[da]=Aurorae vinduesdekorationer
 Name[de]=Aurorae-Fensterdekoration
 Name[el]=Διακοσμήσεις παραθύρου Aurorae
 Name[en_GB]=Aurorae Window Decorations
-Name[es]=Decoración de ventanas Aurorae
+Name[es]=Decoraciones de las ventanas Aurorae
 Name[et]=Aurorae aknadekoratsioonid
 Name[eu]=Aurorae leihoentzako apaingarriak
 Name[fi]=Aurorae-ikkunakehykset
diff --git a/plugins/kdecorations/aurorae/src/kwindecoration.desktop b/plugins/kdecorations/aurorae/src/kwindecoration.desktop
index c8dcf4acf..b34291b03 100644
--- a/plugins/kdecorations/aurorae/src/kwindecoration.desktop
+++ b/plugins/kdecorations/aurorae/src/kwindecoration.desktop
@@ -13,7 +13,7 @@ Comment[da]=KWin vinduesdekoration
 Comment[de]=KWin-Fensterdekoration
 Comment[el]=Διακοσμήσεις παραθύρου KWin
 Comment[en_GB]=KWin Window Decoration
-Comment[es]=Decoración de ventanas de KWin
+Comment[es]=Decoración de las ventanas de KWin
 Comment[et]=KWini akna dekoratsioon
 Comment[eu]=KWin leihoen apainketa
 Comment[fi]=KWin-ikkunakehys