From 47e87b0ea88d68368b018928c2b5b37d06c71555 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 3 Mar 2021 07:50:45 +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"
---
 wallpapers/Next/metadata.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop
index e0b29c8d..9383f47c 100644
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@@ -20,6 +20,7 @@ Name[sl]=Mlečna cesta
 Name[sv]=Vintergatan
 Name[uk]=Чумацький Шлях
 Name[x-test]=xxMilky Wayxx
+Name[zh_CN]=Milky Way 银河
 
 X-KDE-PluginInfo-Name=Next
 X-KDE-PluginInfo-Author=ruvkr