From ce1b5f4ed8071be6ec935a2adc014094dfca7f51 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 10 Feb 2017 05:47:00 +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"
---
 applets/appmenu/package/metadata.desktop | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/applets/appmenu/package/metadata.desktop b/applets/appmenu/package/metadata.desktop
index a891b93f3..edb37010a 100644
--- a/applets/appmenu/package/metadata.desktop
+++ b/applets/appmenu/package/metadata.desktop
@@ -1,6 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Global Menu
+Name[nl]=Globaal menu
+Name[pt]=Menu Global
+Name[uk]=Загальне меню
+Name[x-test]=xxGlobal Menuxx
 Icon=show-menu
 Type=Service
 X-KDE-PluginInfo-Author=Kai Uwe Broulik