From 36a38057fa663a97834ebd70fa128a52166b31c2 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 13 Aug 2019 05:20:27 +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 insertions(+)

diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop
index 011c95d..9c0db76 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -14,6 +14,7 @@ Name[el]=Διαχειριστής κατατμήσεων του KDE
 Name[en_GB]=KDE Partition Manager
 Name[es]=Gestor de particiones de KDE
 Name[et]=KDE partitsioonihaldur
+Name[eu]=KDE Partizio Kudeatzailea
 Name[fi]=KDE:n osionhallinta
 Name[fr]=Gestionnaire de partitions de KDE
 Name[ga]=Bainisteoir Deighiltí KDE
@@ -66,6 +67,7 @@ GenericName[el]=Διαχειριστής κατατμήσεων
 GenericName[en_GB]=Partition Editor
 GenericName[es]=Editor de particiones
 GenericName[et]=Partitsioonihaldur
+GenericName[eu]=Partizio editorea
 GenericName[fi]=Osionhallinta
 GenericName[fr]=Éditeur de partitions
 GenericName[ga]=Eagarthóir Deighiltí
@@ -117,6 +119,7 @@ Comment[el]=Διαχείριση δίσκων, κατατμήσεων και σ
 Comment[en_GB]=Manage disks, partitions and file systems
 Comment[es]=Gestionar discos, particiones y sistemas de archivos
 Comment[et]=Ketaste, partitsioonide ja failisüsteemide haldamine
+Comment[eu]=kudeatu diskoak, partizioak eta fitxategi-sistemak
 Comment[fi]=Hallitse levyjä, osioita ja tiedostojärjestelmiä
 Comment[fr]=Gère les disques, partitions et systèmes de fichiers
 Comment[ga]=Bainistigh dioscaí, deighiltí agus córais comhad
@@ -169,6 +172,7 @@ Keywords[de]=partition;disk;festplatte
 Keywords[el]=κατάτμηση;δίσκος;
 Keywords[en_GB]=partition;disk;
 Keywords[es]=partición;disco;
+Keywords[eu]=partizioa;diskoa;
 Keywords[fi]=osio;levy;
 Keywords[fr]=partition;disque;
 Keywords[gl]=partition;disk;partición;disco;