From 8c6f7582e2e8b1af1e3cae518493fa35c167a8e1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 11 Feb 2017 06:03:33 +0100 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/findmyphone/kdeconnect_findmyphone.json | 2 ++ plugins/kdeconnect.notifyrc | 1 + plugins/notifications/kdeconnect_notifications.json | 2 ++ plugins/remotecommands/kdeconnect_remotecommands.json | 2 ++ plugins/remotekeyboard/kdeconnect_remotekeyboard.json | 2 ++ plugins/sendnotifications/kdeconnect_sendnotifications.json | 2 ++ .../kdeconnect_sendnotifications_config.desktop | 1 + plugins/telephony/kdeconnect_telephony.json | 1 + 8 files changed, 13 insertions(+) diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json index ab085fb0d..6952fe033 100644 --- a/plugins/findmyphone/kdeconnect_findmyphone.json +++ b/plugins/findmyphone/kdeconnect_findmyphone.json @@ -35,6 +35,7 @@ "Description[sv]": "Hitta din förlorade telefon genom att få den att spela ett alarmljud", "Description[uk]": "Знайти загублений телефон, наказавши йому відтворити дзвінок", "Description[x-test]": "xxFind your lost phone by making it play an alarm soundxx", + "Description[zh_CN]": "通过播放闹铃声来找到您不见的手机", "Description[zh_TW]": "讓您的手機發出警報聲，讓您找到您遺失的手機。", "EnabledByDefault": true, "Encoding": "UTF-8", @@ -64,6 +65,7 @@ "Name[sv]": "Hitta min telefon", "Name[uk]": "Дзвінок на вашому телефоні", "Name[x-test]": "xxRing my phonexx", + "Name[zh_CN]": "让我的手机响铃", "Name[zh_TW]": "撥打我的電話", "ServiceTypes": [ "KdeConnect/Plugin" diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 0b333c0e9..8cc191a83 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -132,6 +132,7 @@ Comment[sk]=Požiadavka na spárovanie prijatá zo zariadenia Comment[sv]=Begäran om ihopparning mottagen från en apparat Comment[uk]=Від пристрою отримано запит щодо пов’язування Comment[x-test]=xxPairing request received from a devicexx +Comment[zh_CN]=收到来自一个设备的配对请求 Comment[zh_TW]=從您的裝置當中收到配對請求 Action=Popup diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json index 36a4b3486..63eeb2820 100644 --- a/plugins/notifications/kdeconnect_notifications.json +++ b/plugins/notifications/kdeconnect_notifications.json @@ -31,6 +31,7 @@ "Description[sv]": "Visa enhetens underrättelser på datorn och håll dem synkroniserade", "Description[uk]": "Показ сповіщень з пристрою на цьому комп’ютері та підтримання синхронізації даних сповіщень", "Description[x-test]": "xxShow device's notifications on this computer and keep them in syncxx", + "Description[zh_CN]": "在电脑显示手机通知并保持同步", "Description[zh_TW]": "在電腦上顯示裝置通知並且保持同步", "EnabledByDefault": true, "Icon": "preferences-desktop-notification", @@ -59,6 +60,7 @@ "Name[sv]": "Ta emot underrättelser", "Name[uk]": "Отримати сповіщення", "Name[x-test]": "xxReceive notificationsxx", + "Name[zh_CN]": "接收通知", "Name[zh_TW]": "收到通知", "ServiceTypes": [ "KdeConnect/Plugin" diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json index eef160dcb..16ba1b9dd 100644 --- a/plugins/remotecommands/kdeconnect_remotecommands.json +++ b/plugins/remotecommands/kdeconnect_remotecommands.json @@ -29,6 +29,7 @@ "Description[sv]": "Utför kommandon fördefinierade på den andra apparaten", "Description[uk]": "Запуск команд, попередньо визначених на віддаленому пристрої", "Description[x-test]": "xxTrigger commands predefined on the remote devicexx", + "Description[zh_CN]": "出发远程设备的预设命令", "Description[zh_TW]": "預先設定在遠端設備上的執行命令", "EnabledByDefault": true, "Icon": "system-run", @@ -53,6 +54,7 @@ "Name[sv]": "Fjärrkommandon för värddator", "Name[uk]": "Віддалені команди вузлу", "Name[x-test]": "xxHost remote commandsxx", + "Name[zh_CN]": "主机远程命令", "Name[zh_TW]": "主機與遠端指令", "ServiceTypes": [ "KdeConnect/Plugin" diff --git a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json index 19183347b..6e268e614 100644 --- a/plugins/remotekeyboard/kdeconnect_remotekeyboard.json +++ b/plugins/remotekeyboard/kdeconnect_remotekeyboard.json @@ -20,6 +20,7 @@ "Description[sv]": "Använd tangentbordet för att skicka tangenthändelser till den parade enheten", "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", @@ -36,6 +37,7 @@ "Name[sv]": "Externt tangentbord från skrivbordet", "Name[uk]": "Віддалена клавіатура з комп’ютера", "Name[x-test]": "xxRemote keyboard from the desktopxx", + "Name[zh_CN]": "来自桌面的远程键盘", "ServiceTypes": [ "KdeConnect/Plugin" ], diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications.json b/plugins/sendnotifications/kdeconnect_sendnotifications.json index 713404e85..f60eaa69a 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications.json +++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json @@ -29,6 +29,7 @@ "Description[sv]": "Sänd ut datorns underrättelser så att de kan visas på andra enheter.", "Description[uk]": "Транслювати сповіщення з цього комп’ютера так, щоб їх було показано на інших пристроях.", "Description[x-test]": "xxBroadcast this computer's notifications, so they can be shown on other devices.xx", + "Description[zh_CN]": "广播此计算机的通知，以被其他设备显示。", "Description[zh_TW]": "廣播此電腦的通知，這樣可以顯示在其他裝置上。", "EnabledByDefault": false, "Icon": "preferences-desktop-notification", @@ -57,6 +58,7 @@ "Name[sv]": "Skicka underrättelser", "Name[uk]": "Надіслати сповіщення", "Name[x-test]": "xxSend notificationsxx", + "Name[zh_CN]": "发送通知", "Name[zh_TW]": "傳送通知", "ServiceTypes": [ "KdeConnect/Plugin" diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop index cb8c10354..6b61e4911 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop +++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop @@ -31,6 +31,7 @@ Name[sk]=Nastavenia pluginu notifikácií synchronizácie Name[sv]=Inställningar av insticksprogram för underrättelsesynkronisering Name[uk]=Параметри додатка синхронізації сповіщень Name[x-test]=xxNotification synchronization plugin settingsxx +Name[zh_CN]=通知同步插件设置 Name[zh_TW]=同步通知擴展插件設定 Categories=Qt;KDE;X-KDE-settings-kdeconnect; diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index 824d0cf7c..e3b796a68 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -28,6 +28,7 @@ "Description[sv]": "Visa underrättelser om samtal och SMS", "Description[uk]": "Показ сповіщень щодо дзвінків і SMS", "Description[x-test]": "xxShow notifications for calls and SMSxx", + "Description[zh_CN]": "显示来电和短信通知", "Description[zh_TW]": "顯示來電與短訊通知", "EnabledByDefault": true, "Icon": "call-start",