From 2a3ec0535d9f84cc6bdd71ec51dd97451effc897 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 10 Oct 2018 06:22:01 +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 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop
index 119a7c4..53d54a2 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -2,7 +2,6 @@
 Type=Application
 Name=KDE Partition Manager
 Name[ar]=مدير أقسام كدي
-Name[ast]=Xestor KDE de particiones
 Name[bg]=Управление на дялове за KDE
 Name[bs]=KDE‑ov menadžer particija
 Name[ca]=Gestor de particions del KDE
@@ -54,7 +53,6 @@ Name[zh_CN]=KDE 分区管理器
 Name[zh_TW]=KDE 磁碟分割區管理員
 GenericName=Partition Editor
 GenericName[ar]=محرّر أقسام
-GenericName[ast]=Editor de particiones
 GenericName[bg]=Редактор на дялове
 GenericName[bs]=Uređivač particija
 GenericName[ca]=Editor de particions
@@ -105,7 +103,6 @@ GenericName[zh_CN]=分区编辑器
 GenericName[zh_TW]=磁碟分割區編輯器
 Comment=Manage disks, partitions and file systems
 Comment[ar]=أدِر الأقراص، والأقسام وأنظمة الملفّات
-Comment[ast]=Xestiona discos, particiones y sistemes de ficheros
 Comment[bg]=Управлява размерите на дискове, дялове и операционни системи
 Comment[bs]=Upravljajte diskovima, particijama i datotečnim sistemima
 Comment[ca]=Gestioneu discos, particions i sistemes de fitxers