From 10febd70a7a77b0d03bab52ada5d411c8a33e04c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 16 Sep 2020 06:36:42 +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"
---
 wallpapers/Next/metadata.desktop | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop
index a48f0d95..f63f144f 100644
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@@ -1,5 +1,13 @@
 [Desktop Entry]
 Name=Shell
+Name[ca]=Shell
+Name[de]=Flow
+Name[es]=Shell
+Name[nl]=Shell
+Name[pt]=Consola
+Name[sv]=Skal
+Name[uk]=Оболонка
+Name[x-test]=xxShellxx
 
 X-KDE-PluginInfo-Name=Next
 X-KDE-PluginInfo-Author=Lucas Andrade