From af9ef940a3ea153a42aa5bd343ca9eb1278b94c9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 14 Sep 2021 01:22:52 +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 841e8b86..a382afb1 100644
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@@ -1,5 +1,11 @@
 [Desktop Entry]
 Name=Patak
+Name[ca]=Patak
+Name[es]=Patak
+Name[eu]=Patak
+Name[nl]=Patak
+Name[uk]=Патак
+Name[x-test]=xxPatakxx
 
 X-KDE-PluginInfo-Name=Next
 X-KDE-PluginInfo-Author=Áron Kovács