From 7a17b5a10729938baf1069577ec407af11adc5e4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 13 Jun 2022 04:22:59 +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/org.kde.latte-dock.desktop.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/org.kde.latte-dock.desktop.cmake b/app/org.kde.latte-dock.desktop.cmake
index e7f74cfb2..77073de21 100644
--- a/app/org.kde.latte-dock.desktop.cmake
+++ b/app/org.kde.latte-dock.desktop.cmake
@@ -70,7 +70,7 @@ Comment[zh_TW]=給大眾使用的 Dock
 GenericName=Dock
 GenericName[az]=Dok
 GenericName[ca]=Acobla
-GenericName[ca@valencia]=Acopla
+GenericName[ca@valencia]=Acobla
 GenericName[cs]=Dok
 GenericName[da]=Dok
 GenericName[de]=Dock