From 9467f3878a6451fc192685623d11e922ba7799c8 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 22 Mar 2018 05:19:59 +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"
---
 gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop b/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop
index 9536da47f..d0c785ee4 100644
--- a/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop
+++ b/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop
@@ -9,6 +9,7 @@ Name[fi]=GMenuDBusMenuProxy
 Name[nl]=GMenuDBusMenuProxy
 Name[nn]=GMenuDBusMenuProxy
 Name[pt]=GMenuDBusMenuProxy
+Name[sv]=GMenuDBusMenuProxy
 Name[uk]=Проксі-меню GMenu D-Bus
 Name[x-test]=xxGMenuDBusMenuProxyxx
 Name[zh_CN]=GMenuDBusMenuProxy