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"
2019-10-10 05:23:28 +02:00 · 2019-10-10 05:23:28 +02:00 · caa3e159c9
commit caa3e159c9
parent 58dca31212
1 changed files with 1 additions and 0 deletions
--- a/plugins/presenter/kdeconnect_presenter.json
+++ b/plugins/presenter/kdeconnect_presenter.json
@ -62,6 +62,7 @@
        "Description[sv]": "Använd mobilen för att peka på saker på skärmen",
        "Description[uk]": "Використання мобільного пристрою для керування об'єктами на екрані",
        "Description[x-test]": "xxUse your mobile device to point to things on the screenxx",
+        "Description[zh_CN]": "使用您的移动设备在屏幕上指点",
        "EnabledByDefault": true,
        "Icon": "view-presentation",
        "Id": "kdeconnect_presenter",