From 6ff6dcac26155115a63a28d62c1af8abdb02a8f2 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 25 Jun 2022 01:59:17 +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/kwin.notifyrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/kwin.notifyrc b/src/kwin.notifyrc
index ea00501e3a..5000a6d24e 100644
--- a/src/kwin.notifyrc
+++ b/src/kwin.notifyrc
@@ -72,7 +72,7 @@ Name[az]=Effektlər dayandırıldı
 Name[bg]=Ефектите са временно спрени
 Name[bs]=Slaganje je suspendovano
 Name[ca]=S'ha suspès la composició
-Name[ca@valencia]=S'ha suspès la composició
+Name[ca@valencia]=S'ha suspés la composició
 Name[cs]=Kompozice byla pozastavena
 Name[da]=Compositing er blevet suspenderet
 Name[de]=Compositing ist ausgesetzt worden