From cb1f76d018a7b432e5900724241d6e8e780e699b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 11 Jun 2017 04:31:47 +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/plugins/pmcorebackendplugin.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/pmcorebackendplugin.desktop b/src/plugins/pmcorebackendplugin.desktop
index 212ae39..7e42ba6 100644
--- a/src/plugins/pmcorebackendplugin.desktop
+++ b/src/plugins/pmcorebackendplugin.desktop
@@ -18,7 +18,7 @@ Name[et]=KDE partitsioonihalduri plugin
 Name[fi]=KDE:n osionhallintaliitännäinen
 Name[fr]=Module externe pour le gestionnaire de partitions de KDE
 Name[ga]=Breiseán Bhainisteoir Deighiltí KDE
-Name[gl]=Engadido de xestión de particións de KDE
+Name[gl]=Complemento de xestión de particións de KDE
 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