From 622d96d50a993602d3fcbbdab689a7dfdc284751 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 26 Jul 2021 01:17:42 +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"
---
 quicksettings/nightcolor/metadata.desktop | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/quicksettings/nightcolor/metadata.desktop b/quicksettings/nightcolor/metadata.desktop
index 0fc92118..ba6fc338 100644
--- a/quicksettings/nightcolor/metadata.desktop
+++ b/quicksettings/nightcolor/metadata.desktop
@@ -2,7 +2,9 @@
 Name=Night Color
 Name[ca]=Color de nit
 Name[cs]=Noční barva
+Name[en_GB]=Night Colour
 Name[es]=Color nocturno
+Name[eu]=Gaueko kolorea
 Name[fr]=Couleur de nuit
 Name[nl]=Nachtkleur
 Name[pt]=Cor Nocturna