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 2018-09-07 05:56:51 +02:00
parent 78e7c7d52a
commit 49611c3574
1 changed files with 1 additions and 0 deletions

View File

@ -179,6 +179,7 @@ Keywords[nl]=partitie;schijf
Keywords[nn]=partisjon;disk;
Keywords[pl]=partycja;dysk;
Keywords[pt]=partição;disco;
Keywords[pt_BR]=partição;disco;
Keywords[sl]=razdelek;particija;disk;
Keywords[sr]=partition;disk;партиција;диск;
Keywords[sr@ijekavian]=partition;disk;партиција;диск;