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 2017-02-25 06:23:16 +01:00
parent 299d23230c
commit 9040025acd

View file

@ -37,6 +37,7 @@
"Name[da]": "virtuel",
"Name[de]": "Virtuell",
"Name[el]": "εικονικό",
"Name[hu]": "virtuális",
"Name[nl]": "virtueel",
"Name[nn]": "virtuell",
"Name[pl]": "wirtualne",