From 80aeb86ccfeb535e652a7a4e8616966b50232551 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 30 Mar 2021 01:15:16 +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"
---
 lookandfeel.twilight/metadata.desktop | 2 ++
 wallpapers/Next/metadata.desktop      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/lookandfeel.twilight/metadata.desktop b/lookandfeel.twilight/metadata.desktop
index ae1b44ba..6a17653a 100644
--- a/lookandfeel.twilight/metadata.desktop
+++ b/lookandfeel.twilight/metadata.desktop
@@ -4,6 +4,7 @@ Comment[az]=Breeze -Toranlıq - KDE VDG tərəfindən
 Comment[ca]=Brisa crepuscular, creat pel VDG del KDE
 Comment[cs]=Breeze Twilight od KDE VDG
 Comment[da]=Breeze Twilight af KDE's visuelle designgruppe
+Comment[de]=Breeze-Dämmerung von der KDE VDG
 Comment[el]=Breeze του λυκόφωτος από το KDE VDG
 Comment[en_GB]=Breeze Twilight by the KDE VDG
 Comment[es]=Brisa crepúsculo por KDE VDG
@@ -33,6 +34,7 @@ Name[az]=Breeze Toranlıq
 Name[ca]=Brisa crepuscular
 Name[cs]=Breeze Twilight
 Name[da]=Breeze twilight
+Name[de]=Breeze-Dämmerung
 Name[el]=Breeze του λυκόφωτος
 Name[en_GB]=Breeze Twilight
 Name[es]=Brisa crepúsculo
diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop
index 5d30b307..463acdd1 100644
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@@ -3,6 +3,7 @@ Name=Milky Way
 Name[az]=Süd Yolu
 Name[ca]=Via Làctia
 Name[cs]=Mléčná dráha
+Name[de]=Milchstraße
 Name[el]=Ο Γαλαξίας μας
 Name[en_GB]=Milky Way
 Name[es]=Vía Láctea