From cccbac1ae4f2da37c2454ca4703250b944cb33af Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 11 Oct 2021 01:21:07 +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 eb2b72ba..7f0fcfee 100644
--- a/colors/BreezeClassic.colors
+++ b/colors/BreezeClassic.colors
@@ -110,6 +110,7 @@ Name[ca]=Brisa clàssica
 Name[cs]=Breeze Classic
 Name[de]=Breeze Klassisch
 Name[el]=Breeze κλασικό
+Name[en_GB]=Breeze Classic
 Name[es]=Brisa clásico
 Name[eu]=Breeze klasikoa
 Name[fr]=Breeze classique
diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop
index 742f003e..25ad55d9 100644
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@@ -6,6 +6,7 @@ Name[cs]=Patak
 Name[da]=Patak
 Name[de]=Patak
 Name[el]=Patak
+Name[en_GB]=Patak
 Name[es]=Patak
 Name[eu]=Patak
 Name[fr]=Patak