From 8baad25d47943cdf71cdaeff60ea67d97969fe4d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 2 Oct 2017 05:00:54 +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 80a67f7..c1247e5 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -169,6 +169,7 @@ Keywords[es]=partición;disco;
 Keywords[id]=partisi;disk;
 Keywords[it]=partizione;disco;
 Keywords[nl]=partitie;schijf
+Keywords[pl]=partycja;dysk;
 Keywords[pt]=partição;disco;
 Keywords[sr]=partition;disk;партиција;диск;
 Keywords[sr@ijekavian]=partition;disk;партиција;диск;