From d7c941544ef115727a2524a587bcf6ac4efde023 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 16 Sep 2021 01:17:50 +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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop
index d8bc6785..4caf1d14 100644
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@@ -6,8 +6,10 @@ Name[el]=Patak
 Name[es]=Patak
 Name[eu]=Patak
 Name[fr]=Patak
+Name[hu]=Patak
 Name[it]=Patak
 Name[nl]=Patak
+Name[pt_BR]=Patak
 Name[sl]=Patak
 Name[sv]=Patak
 Name[uk]=Патак