From 9c8a9d677cde983b02db19a85bb2028d3baac4a2 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 16 Sep 2018 05:45:08 +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"
---
 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 ccca2a595..c7bcac23f 100644
--- a/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop
+++ b/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop
@@ -18,6 +18,7 @@ Name[nn]=GMenuDBusMenuProxy
 Name[pl]=GMenuDBusMenuProxy
 Name[pt]=GMenuDBusMenuProxy
 Name[pt_BR]=GMenuDBusMenuProxy
+Name[ru]=GMenuDBusMenuProxy
 Name[sk]=GMenuDBusMenuProxy
 Name[sv]=GMenuDBusMenuProxy
 Name[uk]=Проксі-меню GMenu D-Bus