From 1995a8de8477f6a45038aa26a67ae798b60842a9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 10 Sep 2016 10:01:41 +0000
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 | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/plugins/dummy/pmdummybackendplugin.desktop b/src/plugins/dummy/pmdummybackendplugin.desktop
index 5d02cb8..9761cd0 100644
--- a/src/plugins/dummy/pmdummybackendplugin.desktop
+++ b/src/plugins/dummy/pmdummybackendplugin.desktop
@@ -2,6 +2,7 @@
 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
@@ -46,6 +47,7 @@ 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 41ff2e2..b2d2619 100644
--- a/src/plugins/libparted/pmlibpartedbackendplugin.desktop
+++ b/src/plugins/libparted/pmlibpartedbackendplugin.desktop
@@ -46,6 +46,7 @@ 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