From 464141c0a87d9740e96aabb76d307d6afc548b7a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 1 Sep 2021 01:21:40 +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 92be3590..b62caa1d 100644
--- a/quicksettings/nightcolor/metadata.desktop
+++ b/quicksettings/nightcolor/metadata.desktop
@@ -7,6 +7,7 @@ Name[es]=Color nocturno
 Name[eu]=Gaueko kolorea
 Name[fi]=Yöväri
 Name[fr]=Couleur de nuit
+Name[ia]=Color de Nocte
 Name[it]=Colore notturno
 Name[ko]=야간 색상
 Name[nl]=Nachtkleur