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-05-29 01:46:43 +00:00
parent 734df72e90
commit 1fc3108f14

View file

@ -57,6 +57,7 @@
"Name[uk]": "Перегляд Dolphin",
"Name[vi]": "Khung xem Dolphin",
"Name[x-test]": "xxDolphin Viewxx",
"Name[zh_CN]": "Dolphin 视图",
"Name[zh_TW]": "Dolphin 檢視",
"ServiceTypes": [
"KParts/ReadOnlyPart",