From b176a4162ace632e540279b9e52eea96b57375c5 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 18 Jun 2020 05:38:20 +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"
---
 org.kde.elisa.desktop | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/org.kde.elisa.desktop b/org.kde.elisa.desktop
index 20648054..ae06e8a8 100644
--- a/org.kde.elisa.desktop
+++ b/org.kde.elisa.desktop
@@ -32,6 +32,7 @@ GenericName[sk]=Hudobný prehrávač
 GenericName[sl]=Predvajalnik glasbe
 GenericName[sv]=Musikspelare
 GenericName[uk]=Музичний програвач
+GenericName[x-test]=xxMusic Playerxx
 GenericName[zh_CN]=音乐播放器
 GenericName[zh_TW]=音樂播放器
 Icon=elisa
@@ -68,6 +69,7 @@ Name[sl]=Elisa
 Name[sv]=Elisa
 Name[tr]=Elisa
 Name[uk]=Elisa
+Name[x-test]=xxElisaxx
 Name[zh_CN]=Elisa
 Name[zh_TW]=Elisa
 StartupNotify=false
-- 
GitLab