From 44a7f0d3cb0feb2105aca1df97fe504d87443544 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 23 Jul 2021 01:15:30 +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 | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/quicksettings/nightcolor/metadata.desktop b/quicksettings/nightcolor/metadata.desktop
index 99f1273f..2bbacf7f 100644
--- a/quicksettings/nightcolor/metadata.desktop
+++ b/quicksettings/nightcolor/metadata.desktop
@@ -1,5 +1,13 @@
 [Desktop Entry]
 Name=Night Color
+Name[ca]=Color de nit
+Name[es]=Color nocturno
+Name[nl]=Nachtkleur
+Name[pt]=Cor Nocturna
+Name[pt_BR]=Cor noturna
+Name[sv]=Nattfärg
+Name[uk]=Нічні кольори
+Name[x-test]=xxNight Colorxx
 Icon=redshift-status-on
 
 Type=Service