From 66411f24e6fb16f707318889ecd3f63ec5260ea7 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 27 Jul 2021 01:26:02 +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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quicksettings/nightcolor/metadata.desktop b/quicksettings/nightcolor/metadata.desktop
index ba6fc338..391d7c17 100644
--- a/quicksettings/nightcolor/metadata.desktop
+++ b/quicksettings/nightcolor/metadata.desktop
@@ -12,6 +12,7 @@ Name[pt_BR]=Cor noturna
 Name[sv]=Nattfärg
 Name[uk]=Нічні кольори
 Name[x-test]=xxNight Colorxx
+Name[zh_CN]=夜间颜色
 Icon=redshift-status-on
 
 Type=Service