From 0b1780397e045dc7aee2f7b69206dc6cd740c2c6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 24 Oct 2017 05:07:07 +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 c1247e5..50c5cbc 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -176,5 +176,6 @@ Keywords[sr@ijekavian]=partition;disk;партиција;диск;
 Keywords[sr@ijekavianlatin]=partition;disk;particija;disk;
 Keywords[sr@latin]=partition;disk;particija;disk;
 Keywords[sv]=partition;disk;
+Keywords[tr]=bölümleme;disk;
 Keywords[uk]=розділ;диск;
 Keywords[x-test]=xxpartitionxx;xxdiskxx;