From f2f8a781fdcf8f0b9e84166e71ddc11e0f35696d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 19 Sep 2020 09:44:17 +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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop
index 1afc0e21..23bba135 100644
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@@ -5,12 +5,14 @@ Name[ca]=Shell
 Name[de]=Flow
 Name[el]=Φλοιός
 Name[es]=Shell
+Name[fr]=Interpréteur
 Name[it]=Shell
 Name[nl]=Shell
 Name[pt]=Consola
 Name[sv]=Skal
 Name[uk]=Оболонка
 Name[x-test]=xxShellxx
+Name[zh_TW]=殼層
 
 X-KDE-PluginInfo-Name=Next
 X-KDE-PluginInfo-Author=Lucas Andrade