From f24429a49ab5e049f09f4243462e0aa33980ff07 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 25 Nov 2017 04:32:01 +0100
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"
---
 plasma-mobile.desktop.cmake | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/plasma-mobile.desktop.cmake b/plasma-mobile.desktop.cmake
index 601118af..6c48ff0b 100644
--- a/plasma-mobile.desktop.cmake
+++ b/plasma-mobile.desktop.cmake
@@ -4,4 +4,16 @@ Exec=dbus-launch --exit-with-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasmacom
 TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasmacompositor
 DesktopNames=KDE
 Name=Plasma Mobile
+Name[ca]=Plasma Mòbil
+Name[ca@valencia]=Plasma Mòbil
+Name[es]=Plasma Mobile
+Name[pt]=Plasma Mobile
+Name[uk]=Мобільна Плазма
+Name[x-test]=xxPlasma Mobilexx
 Comment=Plasma Mobile by KDE
+Comment[ca]=Plasma Mòbil, creat per la comunitat KDE
+Comment[ca@valencia]=Plasma Mòbil, creat per la comunitat KDE
+Comment[es]=Plasma Mobile creado por KDE
+Comment[pt]=Plasma Mobile do KDE
+Comment[uk]=Мобільна Плазма від KDE
+Comment[x-test]=xxPlasma Mobile by KDExx