From 9e56be519451a2b90aeaa24ae4dbe2d20fe9321d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 17 Nov 2018 05:55:31 +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/plugins/KDEFrameworksIntegration/metadata.desktop | 1 +
 src/scripts/helloqml/metadata.desktop                 | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/plugins/KDEFrameworksIntegration/metadata.desktop b/src/plugins/KDEFrameworksIntegration/metadata.desktop
index 424cf5850..4968825b7 100644
--- a/src/plugins/KDEFrameworksIntegration/metadata.desktop
+++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop
@@ -24,6 +24,7 @@ Comment[ca]=Proporciona suport pel KIO i per emmagatzemar les contrasenyes al KW
 Comment[ca@valencia]=Proporciona suport pel KIO i per emmagatzemar les contrasenyes al KWallet
 Comment[cs]=Poskytuje podporu pro KIO a ukládání hesel v Kwallet
 Comment[da]=Giver understøttelse af KIO og lagring af adgangskoder i KWallet
+Comment[de]=Unterstützung für KIO und die Speicherung von Passwörtern in KWallet
 Comment[en_GB]=Provides support for KIO and storing passwords in KWallet
 Comment[es]=Implementa KIO y almacenamiento de contraseñas en KWallet
 Comment[fi]=Tarjoaa KIO-tuen sekä salasanojen tallentamisen KWalletiin
diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop
index 5bf148e62..e1b9d551c 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[ca@valencia]=Hola Qml
+Name[de]=Hallo Qml
 Name[en_GB]=Hello QML
 Name[es]=Hola Qml
 Name[fr]=Bonjour Qml
@@ -16,6 +17,7 @@ Name[x-test]=xxHello Qmlxx
 Comment=Sample Qml Plugin
 Comment[ca]=Connector Qml d'exemple
 Comment[ca@valencia]=Connector Qml d'exemple
+Comment[de]=Beispielmodul in Qml
 Comment[en_GB]=Sample QML Plugin
 Comment[es]=Complemento de ejemplo de Qml
 Comment[fr]=Exemple de module externe Qml