From d70c1ab3731b2d451209c3ed104ccf44d25b239a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 10 Sep 2017 04:50:43 +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 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop
index a990079..59b973e 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -164,6 +164,10 @@ Keywords=partition;disk;
 Keywords[ca]=partició;disc;
 Keywords[nl]=partitie;schijf
 Keywords[pt]=partição;disco;
+Keywords[sr]=partition;disk;партиција;диск;
+Keywords[sr@ijekavian]=partition;disk;партиција;диск;
+Keywords[sr@ijekavianlatin]=partition;disk;particija;disk;
+Keywords[sr@latin]=partition;disk;particija;disk;
 Keywords[sv]=partition;disk;
 Keywords[uk]=розділ;диск;
 Keywords[x-test]=xxpartitionxx;xxdiskxx;