From 9dc7e360a402adb4a1b7ec2fbd39774607a3f893 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 11 Nov 2015 10:37:39 +0000
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"
---
 xembed-sni-proxy/xembedsniproxy.desktop | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xembed-sni-proxy/xembedsniproxy.desktop b/xembed-sni-proxy/xembedsniproxy.desktop
index fc74afc38..a80e0ba2d 100644
--- a/xembed-sni-proxy/xembedsniproxy.desktop
+++ b/xembed-sni-proxy/xembedsniproxy.desktop
@@ -9,9 +9,11 @@ Name[fi]=XembedSniProxy
 Name[ko]=XembedSniProxy
 Name[nl]=XembedSniProxy
 Name[nn]=XembedSniProxy
+Name[pl]=XembedSniProxy
 Name[pt]=XembedSniProxy
 Name[pt_BR]=XembedSniProxy
 Name[sk]=XembedSniProxy
+Name[sl]=XembedSniProxy
 Name[sv]=XembedSniProxy
 Name[uk]=XembedSniProxy
 Name[x-test]=xxXembedSniProxyxx