From 1dd8e32d4003286d975d2157dd5bdffff4a35ca6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 8 Sep 2017 04:30:49 +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 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop
index 92c8660..a990079 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -161,3 +161,9 @@ Categories=System;Filesystem;KDE;Qt;
 
 X-KDE-StartupNotify=true
 Keywords=partition;disk;
+Keywords[ca]=partició;disc;
+Keywords[nl]=partitie;schijf
+Keywords[pt]=partição;disco;
+Keywords[sv]=partition;disk;
+Keywords[uk]=розділ;диск;
+Keywords[x-test]=xxpartitionxx;xxdiskxx;