From 14f88fb46cc0433e22265831edc22b015db64c73 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 23 Oct 2018 06:01:07 +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/scripts/helloqml/metadata.desktop          | 2 ++
 src/scripts/middleclickloader/metadata.desktop | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop
index 79e4575cd..aad77e435 100644
--- a/src/scripts/helloqml/metadata.desktop
+++ b/src/scripts/helloqml/metadata.desktop
@@ -4,6 +4,7 @@ Name[ca]=Hola Qml
 Name[ca@valencia]=Hola Qml
 Name[es]=Hola Qml
 Name[fr]=Bonjour Qml
+Name[gl]=Ola Qml
 Name[id]=Hello Qml
 Name[nl]=Hello Qml
 Name[pt]=Olá em QML
@@ -15,6 +16,7 @@ Comment[ca]=Connector Qml d'exemple
 Comment[ca@valencia]=Connector Qml d'exemple
 Comment[es]=Complemento de ejemplo de Qml
 Comment[fr]=Exemple de module externe Qml
+Comment[gl]=Complemento de exemplo de Qml
 Comment[id]=Contoh Plugin Qml
 Comment[nl]=Voorbeeld Qml-plug-in
 Comment[pt]='Plugin' de Exemplo em QML
diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop
index 8a38c3af1..e79d4819d 100644
--- a/src/scripts/middleclickloader/metadata.desktop
+++ b/src/scripts/middleclickloader/metadata.desktop
@@ -7,6 +7,7 @@ Name[en_GB]=MiddleClickLoader
 Name[es]=Cargador de clic central
 Name[fi]=Keskipainikelatain
 Name[fr]=MiddleClickLoader
+Name[gl]=MiddleClickLoader
 Name[id]=MiddleClickLoader
 Name[it]=Caricatore al clic centrale
 Name[nl]=MiddleClickLoader
@@ -24,6 +25,7 @@ Comment[en_GB]=Load text in selection clipboard as URL
 Comment[es]=Cargar texto seleccionado en el portapapeles como URL
 Comment[fi]=Lataa leikepöytävalinnan tekstin verkko-osoitteeksi
 Comment[fr]=Charger l'URL sélectionnée dans le presse-papier
+Comment[gl]=Cargar texto no portapapeis de selección como URL
 Comment[id]=Muat teks dalam seleksi clipboard sebagai URL
 Comment[it]=Carica come URL il testo negli appunti della selezione
 Comment[nl]=Tekst laden in selectieklembord als URL