tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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 2019-10-10 05:23:28 +02:00
parent 58dca31212
commit caa3e159c9
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/presenter/kdeconnect_presenter.json
View file

@ -62,6 +62,7 @@
"Description[sv]": "Använd mobilen för att peka på saker på skärmen", "Description[sv]": "Använd mobilen för att peka på saker på skärmen",
"Description[uk]": "Використання мобільного пристрою для керування об'єктами на екрані", "Description[uk]": "Використання мобільного пристрою для керування об'єктами на екрані",
"Description[x-test]": "xxUse your mobile device to point to things on the screenxx", "Description[x-test]": "xxUse your mobile device to point to things on the screenxx",
"Description[zh_CN]": "使用您的移动设备在屏幕上指点",
"EnabledByDefault": true, "EnabledByDefault": true,
"Icon": "view-presentation", "Icon": "view-presentation",
"Id": "kdeconnect_presenter", "Id": "kdeconnect_presenter",