From f6319ae9cafbde8953450de94adc8c87e96e468c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 28 Jun 2020 06:02:15 +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"
---
 mountiso/mountisoaction.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mountiso/mountisoaction.json b/mountiso/mountisoaction.json
index 23c282e..01d8f13 100644
--- a/mountiso/mountisoaction.json
+++ b/mountiso/mountisoaction.json
@@ -10,6 +10,7 @@
         "Name[en_GB]": "Mount and unmount ISO image",
         "Name[es]": "Montar y desmontar imágenes ISO",
         "Name[et]": "ISO-tõmmise ühendamine ja lahutamine",
+        "Name[eu]": "Muntatuta eta desmuntatu ISO irudiak",
         "Name[fi]": "Liitä ja irrota ISO-levykuva",
         "Name[fr]": "Monter et libérer une image « ISO »",
         "Name[it]": "Monta e smonta immagine iso",
-- 
GitLab