From 485632e6e51ca98f10fdcf4b89c0e60ce74bb021 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 26 Sep 2017 04:54:03 +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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop
index f332c45..696e108 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -163,6 +163,7 @@ Keywords=partition;disk;
 Keywords[ca]=partició;disc;
 Keywords[ca@valencia]=partició;disc;
 Keywords[cs]=oddíl;disk;
+Keywords[de]=partition;disk;festplatte
 Keywords[es]=partición;disco;
 Keywords[id]=partisi;disk;
 Keywords[it]=partizione;disco;