From 025401fc8a96ff5b7cc099d092cd50120343e9f2 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 7 Apr 2017 04:10:40 +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"
---
 runners/appstream/appstreamrunner.desktop | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/runners/appstream/appstreamrunner.desktop b/runners/appstream/appstreamrunner.desktop
index e6b81a37a..a636089a1 100644
--- a/runners/appstream/appstreamrunner.desktop
+++ b/runners/appstream/appstreamrunner.desktop
@@ -1,6 +1,16 @@
 [Desktop Entry]
 Name=Software Center
+Name[nl]=Softwarecentrum
+Name[pt]=Centro de Aplicações
+Name[sv]=Programvarucenter
+Name[uk]=Центр програм
+Name[x-test]=xxSoftware Centerxx
 Comment=Lets you find software
+Comment[nl]=Laat u software vinden
+Comment[pt]=Permite-lhe procurar por aplicações
+Comment[sv]=Låter dig söka efter programvara
+Comment[uk]=Допомагає вам шукати програми
+Comment[x-test]=xxLets you find softwarexx
 Icon=applications-other
 Type=Service
 X-KDE-ServiceTypes=Plasma/Runner