From cda74effe3ff6cfca74774ea8dfb6f7d205e2c1c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 5 Oct 2018 05:52:10 +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 ++
 1 file changed, 2 insertions(+)

diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop
index 5fa0cd3fe..e2d84b455 100644
--- a/src/scripts/helloqml/metadata.desktop
+++ b/src/scripts/helloqml/metadata.desktop
@@ -2,6 +2,7 @@
 Name=Hello Qml
 Name[ca]=Hola Qml
 Name[es]=Hola Qml
+Name[id]=Hello Qml
 Name[nl]=Hello Qml
 Name[pt]=Olá em QML
 Name[sv]=Hallå QML
@@ -10,6 +11,7 @@ Name[x-test]=xxHello Qmlxx
 Comment=Sample Qml Plugin
 Comment[ca]=Connector Qml d'exemple
 Comment[es]=Complemento de ejemplo de Qml
+Comment[id]=Contoh Plugin Qml
 Comment[nl]=Voorbeeld Qml-plug-in
 Comment[pt]='Plugin' de Exemplo em QML
 Comment[sv]=QML-exempelinsticksprogram