From b6a6efc579a817ad13f0964ba713d18f08ff2340 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 30 Dec 2015 09:24:52 +0000
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/plugins/pmcorebackendplugin.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/pmcorebackendplugin.desktop b/src/plugins/pmcorebackendplugin.desktop
index 87edae5..102d92b 100644
--- a/src/plugins/pmcorebackendplugin.desktop
+++ b/src/plugins/pmcorebackendplugin.desktop
@@ -23,7 +23,7 @@ Name[hu]=KDE partíciószerkesztő bővítmény
 Name[id]=Plugin Manajer Partisi KDE
 Name[it]=Estensione del gestore delle partizioni di KDE
 Name[ko]=KDE 파티션 관리자 플러그인
-Name[lt]=KDE skaidinių tvarkyklės priedas
+Name[lt]=KDE skaidinių tvarkyklės papildinys
 Name[mr]=केडीई विभाजन व्यवस्थापक प्लगइन
 Name[nb]=KDE partisjonsbehandler programtillegg
 Name[nds]=Partitschonenpleger-Moduul för KDE