From fc78cae03fa3323e5d5b39afeff35e54a193694a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 19 May 2019 05:33:09 +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"
---
 app/lattedock.notifyrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc
index b210b0f04..764bb0fc5 100644
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@@ -27,7 +27,7 @@ Name[zh_CN]=Latte 停靠栏
 Name[zh_TW]=Latte Dock
 Comment=Latte Dock
 Comment[ar]=رصيف لاتيه
-Comment[ca]=Acoblable del Latte
+Comment[ca]=Acoblador del Latte
 Comment[ca@valencia]=Acoblable del Latte
 Comment[cs]=Dok Latte
 Comment[da]=Latte-dok