From 1f0443532f867143a03d2af1a4432bcd222788ad Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 28 Feb 2018 05:21:18 +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"
---
 src/scripts/hellopython/metadata.desktop | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/scripts/hellopython/metadata.desktop b/src/scripts/hellopython/metadata.desktop
index 246d04140..e4659fb02 100644
--- a/src/scripts/hellopython/metadata.desktop
+++ b/src/scripts/hellopython/metadata.desktop
@@ -1,6 +1,10 @@
 [Desktop Entry]
 Name=Hello Python
+Name[uk]=Привіт, Python
+Name[x-test]=xxHello Pythonxx
 Comment=Example Python extension
+Comment[uk]=Приклад розширення мовою Python
+Comment[x-test]=xxExample Python extensionxx
 
 Icon=
 Type=Service