From 600f0b03e1503e8f16c6e9112a270c8059271ca6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 21 May 2021 01:14:47 +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"
---
 wallpapers/Next/metadata.desktop | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop
index 14bf3c4b..7583f4a7 100644
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@@ -1,5 +1,10 @@
 [Desktop Entry]
 Name=Altai
+Name[ca]=Altai
+Name[de]=Altai
+Name[es]=Altai
+Name[uk]=Алтай
+Name[x-test]=xxAltaixx
 
 X-KDE-PluginInfo-Name=Next
 X-KDE-PluginInfo-Author=Alesya Khoteeva