From 6df8ac4c7d61db2ab759214729bd26de10b613fd Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 28 Oct 2018 04:53:16 +0100
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 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop
index aad77e435..5bf148e62 100644
--- a/src/scripts/helloqml/metadata.desktop
+++ b/src/scripts/helloqml/metadata.desktop
@@ -2,10 +2,12 @@
 Name=Hello Qml
 Name[ca]=Hola Qml
 Name[ca@valencia]=Hola Qml
+Name[en_GB]=Hello QML
 Name[es]=Hola Qml
 Name[fr]=Bonjour Qml
 Name[gl]=Ola Qml
 Name[id]=Hello Qml
+Name[it]=Hello Qml
 Name[nl]=Hello Qml
 Name[pt]=Olá em QML
 Name[sv]=Hallå QML
@@ -14,10 +16,12 @@ Name[x-test]=xxHello Qmlxx
 Comment=Sample Qml Plugin
 Comment[ca]=Connector Qml d'exemple
 Comment[ca@valencia]=Connector Qml d'exemple
+Comment[en_GB]=Sample QML Plugin
 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[it]=Estensione di esempio in Qml
 Comment[nl]=Voorbeeld Qml-plug-in
 Comment[pt]='Plugin' de Exemplo em QML
 Comment[pt_BR]=Plug-in QML de exemplo