From 2fcc37dfb6172e38463f71a9a2ef92039eb3bef3 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 20 Dec 2016 12:47:43 +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/plugins/dummy/pmdummybackendplugin.desktop         | 2 --
 src/plugins/libparted/pmlibpartedbackendplugin.desktop | 2 --
 src/plugins/pmcorebackendplugin.desktop                | 1 -
 3 files changed, 5 deletions(-)

diff --git a/src/plugins/dummy/pmdummybackendplugin.desktop b/src/plugins/dummy/pmdummybackendplugin.desktop
index 9761cd0..5d02cb8 100644
--- a/src/plugins/dummy/pmdummybackendplugin.desktop
+++ b/src/plugins/dummy/pmdummybackendplugin.desktop
@@ -2,7 +2,6 @@
 Encoding=UTF-8
 Name=KDE Partition Manager Dummy Backend
 Name[ar]=سند مدير كدي للأقسام دمية
-Name[ast]=Backend maniquín del xestor de particiones de KDE
 Name[bg]=Празно ядро за управление на дялове в KDE
 Name[bs]=Prazna pozadina za KDE‑ov menadžer particija
 Name[ca]=Dorsal fals del gestor de particions del KDE
@@ -47,7 +46,6 @@ Name[zh_CN]=KDE 分区管理器虚拟后端
 Name[zh_TW]=KDE 磁碟分割區管理員空白後端介面
 Comment=A KDE Partition Manager dummy backend for testing purposes.
 Comment[ar]=سند مدير كدي للأقسام دمية لأغراض اختباريّة.
-Comment[ast]=Un backend maniquín del xestor de particiones de KDE pa propósitos de prueba.
 Comment[bg]=Празно тестово ядро за управление на дялове в KDE
 Comment[bs]=Lažna pozadina za KDE‑ov menadžer particija, za probne namjene.
 Comment[ca]=Un dorsal fals del gestor de particions del KDE amb la finalitat de fer proves.
diff --git a/src/plugins/libparted/pmlibpartedbackendplugin.desktop b/src/plugins/libparted/pmlibpartedbackendplugin.desktop
index 1affccd..41ff2e2 100644
--- a/src/plugins/libparted/pmlibpartedbackendplugin.desktop
+++ b/src/plugins/libparted/pmlibpartedbackendplugin.desktop
@@ -2,7 +2,6 @@
 Encoding=UTF-8
 Name=KDE Partition Manager LibParted Backend
 Name[ar]=سند LibParted لمدير كدي للأقسام
-Name[ast]=Backend LibParted del xestor de ficheros de KDE
 Name[bg]=Ядро LibParted за управление на дялове в KDE
 Name[bs]=LibParted pozadina  za KDE‑ov menadžer particija
 Name[ca]=Dorsal pel LibParted del gestor de particions del KDE
@@ -47,7 +46,6 @@ Name[zh_CN]=KDE 分区管理器 LibParted 后端
 Name[zh_TW]=KDE 磁碟分割區管理員 LibParted 後端介面
 Comment=The LibParted backend for KDE Partition Manager
 Comment[ar]=سند LibParted لمدير كدي للأقسام
-Comment[ast]=El backend de LibParted pal xestor de particiones de KDE
 Comment[bg]=Ядро LibParted за управление на дялове в KDE
 Comment[bs]=Pozadina Libparteda za KDE‑ov menadžer particija
 Comment[ca]=Un dorsal pel LibParted del gestor de particions del KDE
diff --git a/src/plugins/pmcorebackendplugin.desktop b/src/plugins/pmcorebackendplugin.desktop
index 102d92b..e74a9ba 100644
--- a/src/plugins/pmcorebackendplugin.desktop
+++ b/src/plugins/pmcorebackendplugin.desktop
@@ -3,7 +3,6 @@ Type=ServiceType
 X-KDE-ServiceType=PartitionManager/Plugin
 Name=KDE Partition Manager Plugin
 Name[ar]=ملحقة مدير أقسام كدي
-Name[ast]=Complementu del xestor de particiones KDE
 Name[bg]=Приставка за управление на дялове в KDE
 Name[bs]=Dodatak  za KDE‑ov menadžer particija
 Name[ca]=Connector del gestor de particions del KDE