From fd6c1e68265aa255c93023ccdba0fa2d1ce6e01b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 3 May 2019 05:58:45 +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"
---
 shell/metadata.desktop | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/shell/metadata.desktop b/shell/metadata.desktop
index dd773c6b..f95a3e97 100644
--- a/shell/metadata.desktop
+++ b/shell/metadata.desktop
@@ -22,6 +22,12 @@ Name[x-test]=xxPhonexx
 Name[zh_CN]=手机
 Name[zh_TW]=電話
 Comment=Plasma shell for phones
+Comment[ca]=Espai de treball Plasma per a telèfons
+Comment[nl]=Plasma-shell voor telefoons
+Comment[pt]=Área de trabalho Plasma para telemóveis
+Comment[sv]=Plasma skal för telefoner
+Comment[uk]=Оболонка Плазми для телефонів
+Comment[x-test]=xxPlasma shell for phonesxx
 Type=Service
 
 X-KDE-ServiceTypes=Plasma/Shell