Commit caa3e159 authored by Script Kiddy's avatar Script Kiddy

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"
parent 58dca312
Pipeline #8782 passed with stage
in 12 minutes and 53 seconds
......@@ -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",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment