From 0388bc5ab8f2e900f77ca5d0bf10dd573f2d489b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 14 Mar 2022 01:44:16 +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"
---
 colors/BreezeClassic.colors      | 1 +
 wallpapers/Next/metadata.desktop | 1 +
 2 files changed, 2 insertions(+)

diff --git a/colors/BreezeClassic.colors b/colors/BreezeClassic.colors
index 73c955c6..f1cb3e98 100644
--- a/colors/BreezeClassic.colors
+++ b/colors/BreezeClassic.colors
@@ -123,6 +123,7 @@ Name[hu]=Breeze Classic
 Name[ia]=Brisa Classic
 Name[id]=Breeze Klasik
 Name[it]=Brezza classico
+Name[ja]=Breeze クラシック
 Name[ko]=Breeze 고전
 Name[nl]=Breeze Classic
 Name[nn]=Breeze klassisk
diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop
index 71047bd0..48bcb72f 100644
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@@ -16,6 +16,7 @@ Name[hu]=Honeywave
 Name[ia]=Honeywave
 Name[id]=Honeywave
 Name[it]=Honeywave
+Name[ja]=Honeywave
 Name[ko]=허니웨이브
 Name[nl]=Honeywave
 Name[pl]=Fala miodu