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"
This commit is contained in:
l10n daemon script 2021-07-25 01:14:39 +00:00
parent d7de1fb9b1
commit 393047e905

View file

@ -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