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-10-19 01:17:49 +00:00
parent e168b2bdb6
commit d7b7290451

View file

@ -5,6 +5,7 @@ Name[cs]=Režim v Letadle
Name[en_GB]=Airplane Mode
Name[es]=Modo avión
Name[eu]=Hegaldi modua
Name[fi]=Lentokonetila
Name[fr]=Mode Avion
Name[hu]=Repülős üzemmód
Name[ia]=Modo aeroplano