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-08-01 01:21:28 +00:00
parent 3922cd51ab
commit 5ab4624f19

View file

@ -8,6 +8,7 @@ Name[eu]=Gaueko kolorea
Name[fr]=Couleur de nuit
Name[ko]=
Name[nl]=Nachtkleur
Name[pl]=Barwy nocne
Name[pt]=Cor Nocturna
Name[pt_BR]=Cor noturna
Name[sv]=Nattfärg