From 93a0fb62da00d589b023f2aa97229ef5a8cebc35 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 19 May 2022 02:44:35 +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"
---
 app/lattedock.notifyrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc
index c37f2589e..11db54c5c 100644
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@@ -290,7 +290,7 @@ Action=Popup
 Name=Switch to layout
 Name[az]=Maketi Keçmək
 Name[ca]=Commuta a la disposició
-Name[ca@valencia]=Commuta a la disposició
+Name[ca@valencia]=Canvia a la disposició
 Name[cs]=Přepnout na rozložení
 Name[da]=Skift til layout
 Name[de]=Wechsel zu Profil