From 81e09033ca7af58e0383e179af9d5800bd084f32 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 3 Jun 2020 05:24:20 +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 5708ee6..031cfde 100644
--- a/mountiso/mountisoaction.json
+++ b/mountiso/mountisoaction.json
@@ -8,6 +8,7 @@
         "Name[ca]": "Muntatge i desmuntatge d'una imatge ISO",
         "Name[cs]": "Připojit a odpojit obraz iso",
         "Name[nl]": "Aan- en afkoppelen van iso-image",
+        "Name[pt]": "Montar e desmontar a imagem ISO",
         "Name[uk]": "Монтування і демонтування образів ISO",
         "Name[x-test]": "xxMount and unmount iso imagexx",
         "ServiceTypes": [
-- 
GitLab