From 0e714dee65d46148cc24030c89b9d64da77e079a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 10 Feb 2019 05:24:10 +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/org.kde.partitionmanager.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop
index 40a22ca..83b2929 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -160,7 +160,7 @@ Icon=partitionmanager
 Categories=System;Filesystem;KDE;Qt;
 X-KDE-StartupNotify=true
 Keywords=partition;disk;
-Keywords[ast]=partición;discu;
+Keywords[ast]=partición;particionar;discu;
 Keywords[ca]=partició;disc;
 Keywords[ca@valencia]=partició;disc;
 Keywords[cs]=oddíl;disk;