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 2017-07-26 10:23:47 +02:00
parent baf2f9411c
commit 08f31736ad
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/remotekeyboard/kdeconnect_remotekeyboard.json
View file

@ -34,6 +34,7 @@
"Description[tr]": "Eşleşmiş cihazınıza önemli etkinlikler göndermek için klavyenizi kullanın", "Description[tr]": "Eşleşmiş cihazınıza önemli etkinlikler göndermek için klavyenizi kullanın",
"Description[uk]": "Скористайтеся вашою клавіатурою для надсилання подій натискання клавіш на пов’язаний пристрій", "Description[uk]": "Скористайтеся вашою клавіатурою для надсилання подій натискання клавіш на пов’язаний пристрій",
"Description[x-test]": "xxUse your keyboard to send key-events to your paired devicexx", "Description[x-test]": "xxUse your keyboard to send key-events to your paired devicexx",
"Description[zh_CN]": "使用您的键盘发送按键事件给配对的设备",
"EnabledByDefault": true, "EnabledByDefault": true,
"Icon": "edit-select", "Icon": "edit-select",
"Id": "kdeconnect_remotekeyboard", "Id": "kdeconnect_remotekeyboard",
@ -59,6 +60,7 @@
"Name[tr]": "Masaüstünden uzak klavye", "Name[tr]": "Masaüstünden uzak klavye",
"Name[uk]": "Віддалена клавіатура з комп’ютера", "Name[uk]": "Віддалена клавіатура з комп’ютера",
"Name[x-test]": "xxRemote keyboard from the desktopxx", "Name[x-test]": "xxRemote keyboard from the desktopxx",
"Name[zh_CN]": "来自桌面的远程键盘",
"ServiceTypes": [ "ServiceTypes": [
"KdeConnect/Plugin" "KdeConnect/Plugin"
], ],