From 7077fdf1bcedaffd7419b1ada9914e45dbd00b86 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 16 Jan 2022 01:45:14 +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 a60d3432..2f72902a 100644
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@@ -1,8 +1,10 @@
 [Desktop Entry]
 Name=Honeywave
 Name[ca]=Honeywave
+Name[fr]=Onde de miel
 Name[ia]=Honeywave
 Name[nl]=Honeywave
+Name[pl]=Fala miodu
 Name[sv]=Honungsvåg
 Name[uk]=Медова хвиля
 Name[x-test]=xxHoneywavexx