From e8fe3f2fb7195fe562a073d1a78eb05d74670cfd Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 20 Jun 2019 05:27:25 +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/kwinoptions/kwinoptions.desktop | 2 +-
 kcmkwin/kwinrules/kwinrules.desktop     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop
index e8f4d71928..b5da379e69 100644
--- a/kcmkwin/kwinoptions/kwinoptions.desktop
+++ b/kcmkwin/kwinoptions/kwinoptions.desktop
@@ -32,7 +32,7 @@ Name[de]=Fensterverhalten
 Name[el]=Συμπεριφορά παραθύρων
 Name[en_GB]=Window Behaviour
 Name[eo]=Fenestrokonduto
-Name[es]=Comportamiento de la ventana
+Name[es]=Comportamiento de las ventanas
 Name[et]=Akende käitumine
 Name[eu]=Leihoaren portaera
 Name[fa]=رفتار پنجره
diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop
index 191e75970a..dd4fe82a69 100644
--- a/kcmkwin/kwinrules/kwinrules.desktop
+++ b/kcmkwin/kwinrules/kwinrules.desktop
@@ -22,7 +22,7 @@ Name[da]=Vinduesregler
 Name[de]=Fensterregeln
 Name[el]=Κανόνες παραθύρου
 Name[en_GB]=Window Rules
-Name[es]=Reglas de la ventana
+Name[es]=Reglas de las ventanas
 Name[et]=Akna reeglid
 Name[eu]=Leihoaren arauak
 Name[fi]=Ikkunasäännöt
@@ -126,7 +126,7 @@ X-KDE-Keywords[da]=størrelse,position,tilstand,vinduesopførsel,vinduer,specifi
 X-KDE-Keywords[de]=Größe,Position,Status,Fensterverhalten,Fenster,Regeln
 X-KDE-Keywords[el]=μέγεθος,θέση,κατάσταση,συμπεριφορά παραθύρου,παράθυρα,ειδική,εναλλακτικές,απομνημόνευση,κανόνες
 X-KDE-Keywords[en_GB]=size,position,state,window behaviour,windows,specific,workarounds,remember,rules
-X-KDE-Keywords[es]=tamaño,posición,estado,comportamiento de la ventana,ventanas,específicos,soluciones,recordatorio,reglas
+X-KDE-Keywords[es]=tamaño,posición,estado,comportamiento de las ventanas,ventanas,específicos,soluciones,recordatorio,reglas
 X-KDE-Keywords[et]=suurus,asukoht,olek,akende käitumine,aknad,meeldejätmine,reeglid
 X-KDE-Keywords[eu]=tamaina,posizio,egoera,leihoaren portaera,leihoak,zehatz,konponbide,gogorarazpen,arau
 X-KDE-Keywords[fi]=koko,sijainti,tila,ikkunoiden toiminta,ikkunat,erikoisasetukset,ikkunakohtaiset,korjaukset,muista,muistaminen,säännöt