From 39d6c713158b601cacef2fd990cf4527153f58f4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 27 Nov 2017 05:09:08 +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 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plasma-mobile.desktop.cmake b/plasma-mobile.desktop.cmake
index 6c48ff0b..3786d597 100644
--- a/plasma-mobile.desktop.cmake
+++ b/plasma-mobile.desktop.cmake
@@ -7,13 +7,17 @@ Name=Plasma Mobile
 Name[ca]=Plasma Mòbil
 Name[ca@valencia]=Plasma Mòbil
 Name[es]=Plasma Mobile
+Name[nl]=Plasma-mobiel
 Name[pt]=Plasma Mobile
+Name[sv]=Plasma mobil
 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[nl]=Plasma-mobiel door KDE
 Comment[pt]=Plasma Mobile do KDE
+Comment[sv]=Plasma mobil av KDE
 Comment[uk]=Мобільна Плазма від KDE
 Comment[x-test]=xxPlasma Mobile by KDExx