From ad3e5b2c30afcbc51588f8967c69e70b520bac5a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 15 Sep 2021 01:22:12 +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 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop
index a382afb1..d8bc6785 100644
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@@ -1,9 +1,15 @@
 [Desktop Entry]
 Name=Patak
 Name[ca]=Patak
+Name[cs]=Patak
+Name[el]=Patak
 Name[es]=Patak
 Name[eu]=Patak
+Name[fr]=Patak
+Name[it]=Patak
 Name[nl]=Patak
+Name[sl]=Patak
+Name[sv]=Patak
 Name[uk]=Патак
 Name[x-test]=xxPatakxx