From 26db2cfd8c4c65f750197c46468b904ea3f461cf Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 11 Dec 2017 04:38:36 +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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop
index 0542d99..f871822 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -170,6 +170,8 @@ Keywords[en_GB]=partition;disk;
 Keywords[es]=partición;disco;
 Keywords[id]=partisi;disk;
 Keywords[it]=partizione;disco;
+Keywords[ko]=partition;disk;파티션;디스크;
+Keywords[lt]=skaidinys;diskas;
 Keywords[nl]=partitie;schijf
 Keywords[pl]=partycja;dysk;
 Keywords[pt]=partição;disco;