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 2022-07-15 01:51:02 +00:00
parent 513fe3bb42
commit d4ed58f6a9

View file

@ -147,6 +147,7 @@ Keywords[ru]=files;file management;file browsing;samba;network shares;Explorer;F
Keywords[sk]=súbory;správa súborov;prehliadanie súborov;samba;zdieľanie v sieti;Prieskumník;Vyhľadávač;
Keywords[sl]=datoteke;upravljanje z datotekami;brskanje po datotekah;samba;mrežni diski;Raziskovalec;Iskalec;
Keywords[sv]=filer;filhantering;filbläddring;samba;delade nätverksresurser;Utforskare;Finder;
Keywords[ta]=files;file management;file browsing;samba;network shares;Explorer;Finder; ; ; ; ி; ; ி ி; ி ி; ி;
Keywords[tr]=dosyalar;dosya yönetimi;dosya göz at;samba;ağ paylaşımları;Explorer;Finder;
Keywords[uk]=files;file management;file browsing;samba;network shares;Explorer;Finder;файли;керування файлами;навігація;самба;спільні ресурси;мережа;експлорер;провідник;файндер;
Keywords[vi]=files;file management;file browsing;samba;network shares;Explorer;Finder;tp;qun lí tp;duyt tp;chia s mng;