From 60f48d729cc42fbfdfe081610b3ccaaac52c54ff Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 29 Aug 2021 01:21:08 +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 0b3fdd84..a64173cb 100644 --- a/quicksettings/nightcolor/metadata.desktop +++ b/quicksettings/nightcolor/metadata.desktop @@ -5,6 +5,7 @@ Name[cs]=Noční barva Name[en_GB]=Night Colour Name[es]=Color nocturno Name[eu]=Gaueko kolorea +Name[fi]=Yöväri Name[fr]=Couleur de nuit Name[it]=Colore notturno Name[ko]=야간 색상