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 2023-05-23 01:42:41 +00:00
parent c4a006984c
commit 65b4b9c4ea

View file

@ -97,6 +97,7 @@
"Name[tr]": "Büyük Ekran sesle denetim", "Name[tr]": "Büyük Ekran sesle denetim",
"Name[uk]": "Голосове керування Bigscreen", "Name[uk]": "Голосове керування Bigscreen",
"Name[x-test]": "xxBigscreen voice controlxx", "Name[x-test]": "xxBigscreen voice controlxx",
"Name[zh_CN]": "Bigscreen 语音控制",
"ServiceTypes": [ "ServiceTypes": [
"KdeConnect/Plugin" "KdeConnect/Plugin"
], ],