From 1386c4325c0f4201d92023325b3ae79f66c70ef7 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 8 Feb 2022 01:45:25 +0000
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"
---
 src/kcmkwin/kwintabbox/kwintabbox.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/kcmkwin/kwintabbox/kwintabbox.desktop b/src/kcmkwin/kwintabbox/kwintabbox.desktop
index 5ac071d446..b4fdbd5bc2 100644
--- a/src/kcmkwin/kwintabbox/kwintabbox.desktop
+++ b/src/kcmkwin/kwintabbox/kwintabbox.desktop
@@ -21,7 +21,7 @@ Name[da]=Opgaveskifter
 Name[de]=Anwendungsumschalter
 Name[el]=Εναλλαγή εργασιών
 Name[en_GB]=Task Switcher
-Name[es]=Cambiador de tareas
+Name[es]=Selector de tareas
 Name[et]=Ülesannete vahetaja
 Name[eu]=Ataza-aldarazlea
 Name[fi]=Ikkunanvalitsin