From 519764f421ab88c696fc9512b315251340d3f92b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 3 Dec 2018 05:29:37 +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/middleclickloader/metadata.desktop        | 1 +
 src/scripts/runaction/actions/mpv.desktop             | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/plugins/KDEFrameworksIntegration/metadata.desktop b/src/plugins/KDEFrameworksIntegration/metadata.desktop
index 4968825b7..9872ad954 100644
--- a/src/plugins/KDEFrameworksIntegration/metadata.desktop
+++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop
@@ -4,6 +4,7 @@ Name[ca]=Integració amb els Frameworks del KDE
 Name[ca@valencia]=Integració amb els Frameworks del KDE
 Name[cs]=Integrace KDE Frameworks
 Name[da]=KDE Frameworks integration
+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/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop
index bf070f299..6f6a86b98 100644
--- a/src/scripts/middleclickloader/metadata.desktop
+++ b/src/scripts/middleclickloader/metadata.desktop
@@ -22,6 +22,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 7677ed518..3a52b0b28 100644
--- a/src/scripts/runaction/actions/mpv.desktop
+++ b/src/scripts/runaction/actions/mpv.desktop
@@ -4,6 +4,7 @@ Name[ca]=Obre amb el «mpv»
 Name[ca@valencia]=Obri amb el «mpv»
 Name[cs]=Otevřít pomocí mpv
 Name[da]=Åbn med mpv
+Name[de]=Mit mpv öffnen
 Name[en_GB]=Open with mpv
 Name[es]=Abrir con mpv
 Name[fi]=Avaa mpv:hen