From 3908c521ca3ca1b47b593b3d992e0d8f112c73f0 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 13 Jan 2016 10:35:10 +0000
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"
---
 examples/developerguide/basic/metadata.desktop      | 1 +
 templates/cpp-plasmoid/src/package/metadata.desktop | 2 ++
 templates/qml-plasmoid/package/metadata.desktop     | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/examples/developerguide/basic/metadata.desktop b/examples/developerguide/basic/metadata.desktop
index 78ba5d138..4c666c94f 100644
--- a/examples/developerguide/basic/metadata.desktop
+++ b/examples/developerguide/basic/metadata.desktop
@@ -2,6 +2,7 @@
 Comment=Basic App
 Comment[ca]=Aplicació bàsica
 Comment[ca@valencia]=Aplicació bàsica
+Comment[de]=Einfache Anwendung
 Comment[en_GB]=Basic App
 Comment[es]=Aplicación básica
 Comment[fi]=Perussovellus
diff --git a/templates/cpp-plasmoid/src/package/metadata.desktop b/templates/cpp-plasmoid/src/package/metadata.desktop
index 081eaab51..2b04efafd 100644
--- a/templates/cpp-plasmoid/src/package/metadata.desktop
+++ b/templates/cpp-plasmoid/src/package/metadata.desktop
@@ -3,6 +3,7 @@ Name=%{APPNAME}
 Name[ca]=%{APPNAME}
 Name[ca@valencia]=%{APPNAME}
 Name[da]=%{APPNAME}
+Name[de]=%{APPNAME}
 Name[en_GB]=%{APPNAME}
 Name[es]=%{APPNAME}
 Name[fi]=%{APPNAME}
@@ -27,6 +28,7 @@ Comment=what your app does in a few words
 Comment[ca]=Què fa aquesta aplicació en poques paraules
 Comment[ca@valencia]=Què fa esta aplicació en poques paraules
 Comment[da]=nogle få ord om hvad din app gør
+Comment[de]=In ein paar Worten, was Ihre Anwendung tut
 Comment[en_GB]=what your app does in a few words
 Comment[es]=lo que hace su aplicación, en pocas palabras
 Comment[fi]=ohjelmasi toiminta muutamalla sanalla
diff --git a/templates/qml-plasmoid/package/metadata.desktop b/templates/qml-plasmoid/package/metadata.desktop
index f0058f7bd..78cbd92be 100644
--- a/templates/qml-plasmoid/package/metadata.desktop
+++ b/templates/qml-plasmoid/package/metadata.desktop
@@ -3,6 +3,7 @@ Name=%{APPNAME}
 Name[ca]=%{APPNAME}
 Name[ca@valencia]=%{APPNAME}
 Name[da]=%{APPNAME}
+Name[de]=%{APPNAME}
 Name[en_GB]=%{APPNAME}
 Name[es]=%{APPNAME}
 Name[fi]=%{APPNAME}
@@ -27,6 +28,7 @@ Comment=what your app does in a few words
 Comment[ca]=Què fa aquesta aplicació en poques paraules
 Comment[ca@valencia]=Què fa esta aplicació en poques paraules
 Comment[da]=nogle få ord om hvad din app gør
+Comment[de]=In ein paar Worten, was Ihre Anwendung tut
 Comment[en_GB]=what your app does in a few words
 Comment[es]=lo que hace su aplicación, en pocas palabras
 Comment[fi]=ohjelmasi toiminta muutamalla sanalla