From c1e66fa428bc501804315bae97b5e3a6039b760c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 5 Oct 2020 10:03:25 +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 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop
index 13292b7e..eca486dd 100644
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@@ -2,6 +2,7 @@
 Name=Shell
 Name[az]=Üzlük
 Name[ca]=Shell
+Name[da]=Skal
 Name[de]=Flow
 Name[el]=Φλοιός
 Name[en_GB]=Shell
@@ -9,11 +10,13 @@ Name[es]=Shell
 Name[eu]=Oskola
 Name[fr]=Interpréteur
 Name[it]=Shell
+Name[ko]=셸
 Name[nl]=Shell
 Name[nn]=Skal
 Name[pt]=Consola
 Name[pt_BR]=Concha
 Name[ro]=Înveliș
+Name[ru]=Ракушка
 Name[sk]=Ulita
 Name[uk]=Оболонка
 Name[x-test]=xxShellxx