From 393047e9059b0261d38ea1745df211100d44cb84 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 25 Jul 2021 01:14:39 +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 6ada6669..0fc92118 100644 --- a/quicksettings/nightcolor/metadata.desktop +++ b/quicksettings/nightcolor/metadata.desktop @@ -3,6 +3,7 @@ Name=Night Color Name[ca]=Color de nit Name[cs]=Noční barva Name[es]=Color nocturno +Name[fr]=Couleur de nuit Name[nl]=Nachtkleur Name[pt]=Cor Nocturna Name[pt_BR]=Cor noturna