From a6ed618ba6b737848bef6ec007947ad8adc398ea Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 27 Nov 2017 04:58:05 +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 acb5f70..0542d99 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -166,6 +166,7 @@ Keywords[cs]=oddíl;disk;
 Keywords[da]=partition;disk;
 Keywords[de]=partition;disk;festplatte
 Keywords[el]=κατάτμηση;δίσκος;
+Keywords[en_GB]=partition;disk;
 Keywords[es]=partición;disco;
 Keywords[id]=partisi;disk;
 Keywords[it]=partizione;disco;