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 2023-06-16 01:40:55 +00:00
parent d63d53eff1
commit 51fcd600a8

View file

@ -97,7 +97,7 @@ Name[ie]=Compact
Name[is]=Þétt
Name[it]=Compatta
Name[ja]=
Name[ka]=
Name[ka]=
Name[ko]=
Name[lt]=Kompaktiškas
Name[lv]=Kompakts