From a558641bf6dacefa2ffdd26a91ee00aebe68006a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 3 May 2019 05:51:44 +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 a28bbba..011c95d 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -182,6 +182,7 @@ Keywords[pl]=partycja;dysk;
 Keywords[pt]=partição;disco;
 Keywords[pt_BR]=partição;disco;
 Keywords[ru]=раздел;диск;
+Keywords[sk]=partícia;disk;
 Keywords[sl]=razdelek;particija;disk;
 Keywords[sr]=partition;disk;партиција;диск;
 Keywords[sr@ijekavian]=partition;disk;партиција;диск;