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 2024-10-23 03:04:31 +00:00
parent e3febae013
commit 0ed48894b8

View file

@ -101,7 +101,7 @@ GenericName[sr@ijekavianlatin]=Sinhronizacija uređaja
GenericName[sr@latin]=Sinhronizacija uređaja
GenericName[sv]=Enhetssynkronisering
GenericName[ta]= ி
GenericName[tr]=Aygıt Eşzamanlaması
GenericName[tr]=Aygıt Eşzamanlama
GenericName[uk]=Синхронізація із пристроями
GenericName[x-test]=xxDevice Synchronizationxx
GenericName[zh_CN]=