From fb786c99f977d4d2b0993ffc2a97875daf21afd5 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 14 Oct 2018 06:19:16 +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/plasma/metadata.desktop.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plasma/metadata.desktop.cmake b/src/plasma/metadata.desktop.cmake
index 93eaf5f..909e29a 100644
--- a/src/plasma/metadata.desktop.cmake
+++ b/src/plasma/metadata.desktop.cmake
@@ -7,6 +7,7 @@ Name[da]=Softwareopdateringer
 Name[de]=Softwareaktualisierungen
 Name[en_GB]=Software Updates
 Name[es]=Actualizaciones de software
+Name[eu]=Software eguneratzeak
 Name[fi]=Ohjelmistopäivitykset
 Name[fr]=Mises à jour des logiciels
 Name[gl]=Actualizacións de software
@@ -34,6 +35,7 @@ Comment[da]=Hent softwareopdateringer
 Comment[de]=Softwareaktualisierungen beziehen
 Comment[en_GB]=Get software updates
 Comment[es]=Obtener actualizaciones de software
+Comment[eu]=Lortu software eguneratzeak
 Comment[fi]=Nouda ohjelmistopäivitykset
 Comment[fr]=Télécharger les mises à jour des logiciels
 Comment[gl]=Obteña actualizacións de software.