From 551b53ea9cd97543393e74f7e01b688935a37e15 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 8 Dec 2019 05:22:17 +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 9c0db76..3ed569f 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -172,6 +172,7 @@ Keywords[de]=partition;disk;festplatte
 Keywords[el]=κατάτμηση;δίσκος;
 Keywords[en_GB]=partition;disk;
 Keywords[es]=partición;disco;
+Keywords[et]=partitsioon;ketas;
 Keywords[eu]=partizioa;diskoa;
 Keywords[fi]=osio;levy;
 Keywords[fr]=partition;disque;