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-25 02:48:40 +00:00
parent 1671ab99a1
commit ea0ed96731

View file

@ -115,7 +115,7 @@
"Name[sk]": "Veľká obrazovka",
"Name[sl]": "Veliki zaslon",
"Name[sv]": "Storskärm",
"Name[tr]": "Bigscreen",
"Name[tr]": "Büyük Ekran",
"Name[uk]": "Великий екран",
"Name[x-test]": "xxBigscreenxx",
"Name[zh_CN]": "大屏幕",