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-09-28 02:00:06 +00:00
parent aa54a68e93
commit 13712a5065

View file

@ -135,7 +135,7 @@ Keywords[fr]=fichiers ; gestion de fichiers ; navigation parmi les fichiers ;
Keywords[hi]=; ; ि;; ;;;
Keywords[hu]=fájlok;fájlkezelés;fájlböngészés;samba;hálózati megosztások;Explorer;Finder;
Keywords[ia]=files; gestion de file; navigation de file;samba; partes de rete;Explorator;Trovator;
Keywords[id]=files;file management;file browsing;samba;network shares;Explorer;Finder;manajer;
Keywords[id]=file;berkas;pengelola file;peramban file;samba;pembagian jaringan;Explorer;Finder;
Keywords[is]=skrár;skráastjórn;skráaskoðun;samba;netsameignir;Explorer;Finder;
Keywords[it]=file;gestione dei file;navigazione dei file;samba;condivisioni di rete;Explorer;Finder;
Keywords[ka]=files;file management;file browsing;samba;network shares;Explorer;Finder;