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-11-14 04:38:05 +01:00
parent c601e875cf
commit 049b34c050

View file

@ -37,6 +37,7 @@
"Name": "virtual",
"Name[ca@valencia]": "Virtual",
"Name[ca]": "Virtual",
"Name[cs]": "virtuální",
"Name[da]": "virtuel",
"Name[de]": "Virtuell",
"Name[el]": "εικονικό",