From 08f31736ad706728a72301c0f645ec45dae32101 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 26 Jul 2017 10:23:47 +0200 Subject: [PATCH] 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" --- plugins/remotekeyboard/kdeconnect_remotekeyboard.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json index 4b89abf1e..77c66004c 100644 --- a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json +++ b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json @@ -34,6 +34,7 @@ "Description[tr]": "Eşleşmiş cihazınıza önemli etkinlikler göndermek için klavyenizi kullanın", "Description[uk]": "Скористайтеся вашою клавіатурою для надсилання подій натискання клавіш на пов’язаний пристрій", "Description[x-test]": "xxUse your keyboard to send key-events to your paired devicexx", + "Description[zh_CN]": "使用您的键盘发送按键事件给配对的设备", "EnabledByDefault": true, "Icon": "edit-select", "Id": "kdeconnect_remotekeyboard", @@ -59,6 +60,7 @@ "Name[tr]": "Masaüstünden uzak klavye", "Name[uk]": "Віддалена клавіатура з комп’ютера", "Name[x-test]": "xxRemote keyboard from the desktopxx", + "Name[zh_CN]": "来自桌面的远程键盘", "ServiceTypes": [ "KdeConnect/Plugin" ],