From 8b6ae2439a4f5ca33f2e7af434807d3a2912da8d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 28 Jul 2020 06:12:20 +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               | 4 ++--
 containment/metadata.desktop.cmake   | 2 +-
 containment/package/metadata.desktop | 2 +-
 plasmoid/metadata.desktop.cmake      | 2 +-
 plasmoid/package/metadata.desktop    | 2 +-
 shell/metadata.desktop.cmake         | 2 +-
 shell/package/metadata.desktop       | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc
index aafd51066..8ff761ba3 100644
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@@ -1,7 +1,7 @@
 [Global]
 Name=Latte Dock
 Name[ar]=رصيف لاتيه
-Name[ca]=Latte Dock
+Name[ca]=Acoblador Latte
 Name[ca@valencia]=Latte Dock
 Name[cs]=Dok Latte
 Name[da]=Latte-dok
@@ -33,7 +33,7 @@ Name[zh_CN]=Latte 停靠栏
 Name[zh_TW]=Latte Dock
 Comment=Latte Dock
 Comment[ar]=رصيف لاتيه
-Comment[ca]=Acoblador del Latte
+Comment[ca]=Acoblador Latte
 Comment[ca@valencia]=Acoblador del Latte
 Comment[cs]=Dok Latte
 Comment[da]=Latte-dok
diff --git a/containment/metadata.desktop.cmake b/containment/metadata.desktop.cmake
index d8cec1ad7..c2380177e 100644
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@@ -32,7 +32,7 @@ Name[x-test]=xxLattexx
 Name[zh_CN]=Latte
 Name[zh_TW]=Latte
 Comment=Containment provided for the Latte Dock
-Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
+Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
 Comment[ca@valencia]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[da]=Beholder til Latte-dokken
 Comment[de]=Containment für Latte-Dock
diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop
index c43f8cfd8..11311d2f2 100644
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@@ -32,7 +32,7 @@ Name[x-test]=xxLattexx
 Name[zh_CN]=Latte
 Name[zh_TW]=Latte
 Comment=Containment provided for the Latte Dock
-Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
+Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
 Comment[ca@valencia]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[da]=Beholder til Latte-dokken
 Comment[de]=Containment für Latte-Dock
diff --git a/plasmoid/metadata.desktop.cmake b/plasmoid/metadata.desktop.cmake
index db0feca31..b9eddb17e 100644
--- a/plasmoid/metadata.desktop.cmake
+++ b/plasmoid/metadata.desktop.cmake
@@ -29,7 +29,7 @@ Name[x-test]=xxLatte Tasksxx
 Name[zh_CN]=Latte 任务管理器
 Name[zh_TW]=Latte 工作
 Comment=Tasks plasmoid from Latte Dock
-Comment[ca]=Plasmoide de tasques del Latte Dock
+Comment[ca]=Plasmoide de tasques de l'acoblador Latte
 Comment[ca@valencia]=Plasmoide de tasques del Latte Dock
 Comment[cs]=Plasmoid úloh z doku Latte
 Comment[el]=Γραφικό συστατικό εργασιών από Latte Dock
diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop
index a2e27703d..e1d9a5745 100644
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@@ -29,7 +29,7 @@ Name[x-test]=xxLatte Tasksxx
 Name[zh_CN]=Latte 任务管理器
 Name[zh_TW]=Latte 工作
 Comment=Tasks plasmoid from Latte Dock
-Comment[ca]=Plasmoide de tasques del Latte Dock
+Comment[ca]=Plasmoide de tasques de l'acoblador Latte
 Comment[ca@valencia]=Plasmoide de tasques del Latte Dock
 Comment[cs]=Plasmoid úloh z doku Latte
 Comment[el]=Γραφικό συστατικό εργασιών από Latte Dock
diff --git a/shell/metadata.desktop.cmake b/shell/metadata.desktop.cmake
index 05fded6c7..0b2826984 100644
--- a/shell/metadata.desktop.cmake
+++ b/shell/metadata.desktop.cmake
@@ -31,7 +31,7 @@ Name[x-test]=xxLatte Shellxx
 Name[zh_CN]=Latte Shell
 Name[zh_TW]=Latte Shell
 Comment=Shell provided for the Latte Dock
-Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
+Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
 Comment[ca@valencia]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[da]=Skal til Latte-dokken
 Comment[de]=Shell für Latte-Dock
diff --git a/shell/package/metadata.desktop b/shell/package/metadata.desktop
index c8929b7b5..4daf52fa6 100644
--- a/shell/package/metadata.desktop
+++ b/shell/package/metadata.desktop
@@ -31,7 +31,7 @@ Name[x-test]=xxLatte Shellxx
 Name[zh_CN]=Latte Shell
 Name[zh_TW]=Latte Shell
 Comment=Shell provided for the Latte Dock
-Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
+Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
 Comment[ca@valencia]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[da]=Skal til Latte-dokken
 Comment[de]=Shell für Latte-Dock