From 0183d07911c9878b301f06d41d3637d0da1cde5a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 17 Jun 2020 14:16:35 +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"
---
 src/org.kde.partitionmanager.desktop | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop
index a25188e..577c379 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -50,7 +50,6 @@ Name[th]=เครื่องมือจัดการพาร์ทิช
 Name[tr]=KDE Partition Manager
 Name[ug]=KDE دىسكا رايونى باشقۇرغۇ
 Name[uk]=Керування розділами диска KDE
-Name[x-test]=xxKDE Partition Managerxx
 Name[zh_CN]=KDE 分区管理器
 Name[zh_TW]=KDE 磁碟分割區管理員
 GenericName=Partition Editor
@@ -102,7 +101,6 @@ GenericName[th]=แก้ไขพาร์ทิชัน
 GenericName[tr]=Disk Bölümü Düzenleyici
 GenericName[ug]=دىسكا رايونى تەھرىرلىگۈچ
 GenericName[uk]=Редактор розділів диска
-GenericName[x-test]=xxPartition Editorxx
 GenericName[zh_CN]=分区编辑器
 GenericName[zh_TW]=磁碟分割區編輯器
 Comment=Manage disks, partitions and file systems
@@ -155,7 +153,6 @@ Comment[th]=จัดการดิสก์, พาร์ทิชัน แ
 Comment[tr]=Diskleri, disk bölümlerini ve dosya sistemlerini yönet
 Comment[ug]=دىسكىلارنى، دىسكا رايونلىرىنى ۋە ھۆججەت سىستېمىسىنى باشقۇرۇش پروگراممىسى
 Comment[uk]=Керуйте дисками, розділами та файловими системами
-Comment[x-test]=xxManage disks, partitions and file systemsxx
 Comment[zh_CN]=管理磁盘、分区和文件系统
 Comment[zh_TW]=管理磁碟、分割區與檔案系統
 Exec=partitionmanager
@@ -197,6 +194,5 @@ Keywords[sr@latin]=partition;disk;particija;disk;
 Keywords[sv]=partition;disk;
 Keywords[tr]=bölümleme;disk;
 Keywords[uk]=розділ;диск;
-Keywords[x-test]=xxpartitionxx;xxdiskxx;
 Keywords[zh_CN]=partition;disk;分区;磁盘;
 Keywords[zh_TW]=partition;disk;分割區;磁碟;硬碟