From d7de1fb9b13245f3b423687450bbbdfd568d2a8a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 24 Jul 2021 01:14:22 +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 2bbacf7f..6ada6669 100644 --- a/quicksettings/nightcolor/metadata.desktop +++ b/quicksettings/nightcolor/metadata.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=Night Color Name[ca]=Color de nit +Name[cs]=Noční barva Name[es]=Color nocturno Name[nl]=Nachtkleur Name[pt]=Cor Nocturna