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-11-13 01:28:37 +00:00
parent f81271d303
commit 1f99e09948

View file

@ -9,6 +9,7 @@ Name[fi]=Lentokonetila
Name[fr]=Mode Avion
Name[hu]=Repülős üzemmód
Name[ia]=Modo aeroplano
Name[ko]=
Name[nl]=Vliegtuigmodus
Name[nn]=Flymodus
Name[pa]=