From 483f5f70b53dc2130db936f1b8375819a11f9f57 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 19 Jun 2019 08:52:28 +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/plugins/KDEFrameworksIntegration/metadata.desktop | 1 +
 src/scripts/helloqml/metadata.desktop                 | 1 +
 src/scripts/middleclickloader/metadata.desktop        | 2 ++
 src/scripts/runaction/actions/mpv.desktop             | 1 +
 4 files changed, 5 insertions(+)

diff --git a/src/plugins/KDEFrameworksIntegration/metadata.desktop b/src/plugins/KDEFrameworksIntegration/metadata.desktop
index cca6216f9..4681c9cbc 100644
--- a/src/plugins/KDEFrameworksIntegration/metadata.desktop
+++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop
@@ -3,6 +3,7 @@ Name=KDE Frameworks Integration
 Name[ca]=Integració amb els Frameworks del KDE
 Name[ca@valencia]=Integració amb els Frameworks del KDE
 Name[cs]=Integrace KDE Frameworks
+Name[de]=KDE-Frameworks-Integration
 Name[en_GB]=KDE Frameworks Integration
 Name[es]=Integración con la infraestructura de KDE
 Name[fi]=KDE Frameworks -integrointi
diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop
index 2119ed8c2..9d826ac79 100644
--- a/src/scripts/helloqml/metadata.desktop
+++ b/src/scripts/helloqml/metadata.desktop
@@ -3,6 +3,7 @@ Name=Hello Qml
 Name[ca]=Hola QML
 Name[ca@valencia]=Hola QML
 Name[cs]=Ahoj QML
+Name[de]=Hallo QML
 Name[en_GB]=Hello QML
 Name[es]=Hola Qml
 Name[fi]=Hei QML
diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop
index 1a655f9a5..ddcfd1bf2 100644
--- a/src/scripts/middleclickloader/metadata.desktop
+++ b/src/scripts/middleclickloader/metadata.desktop
@@ -3,6 +3,7 @@ Name=MiddleClickLoader
 Name[ca]=MiddleClickLoader
 Name[ca@valencia]=MiddleClickLoader
 Name[cs]=Načtení prostředním tlačítkem myši
+Name[de]=Mittelklick-Lader
 Name[en_GB]=MiddleClickLoader
 Name[es]=Cargador de clic central
 Name[fi]=Keskipainikelatain
@@ -25,6 +26,7 @@ Comment=Load text in selection clipboard as URL
 Comment[ca]=Carrega text com a URL en una selecció del porta-retalls
 Comment[ca@valencia]=Carrega text com a URL en una selecció del porta-retalls
 Comment[cs]=Načíst text ve schránce výběru jako URL
+Comment[de]=Text in der Auswahl der Zwischenablage als URL laden
 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
diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop
index 2302f801a..1cbfc1bb5 100644
--- a/src/scripts/runaction/actions/mpv.desktop
+++ b/src/scripts/runaction/actions/mpv.desktop
@@ -3,6 +3,7 @@ Name=Open with mpv
 Name[ca]=Obre amb el «mpv»
 Name[ca@valencia]=Obri amb el «mpv»
 Name[cs]=Otevřít pomocí mpv
+Name[de]=Mit mpv öffnen
 Name[en_GB]=Open with mpv
 Name[es]=Abrir con mpv
 Name[fi]=Avaa mpv:hen