From c1ca4a3399069d00ff986ddf00a8a233d37a3c7d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 30 Dec 2020 06:52:26 +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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop
index db54d94..6769920 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -181,6 +181,7 @@ Keywords[eu]=partizioa;diskoa;
 Keywords[fi]=osio;levy;
 Keywords[fr]=partition;disque;
 Keywords[gl]=partition;disk;partición;disco;
+Keywords[hu]=partíció;lemez;
 Keywords[id]=partisi;disk;
 Keywords[it]=partizione;disco;
 Keywords[ko]=partition;disk;파티션;디스크;