From 27179256fcf8a24e3dc5218a19fb188d1d17247b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 6 May 2019 08:50:21 +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" --- fileitemactionplugin/kdeconnectsendfile.desktop | 2 ++ plugins/sendnotifications/kdeconnect_sendnotifications.json | 2 ++ plugins/telephony/kdeconnect_telephony.json | 1 + 3 files changed, 5 insertions(+) diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop index cf77dc0d3..51fdf3ec0 100644 --- a/fileitemactionplugin/kdeconnectsendfile.desktop +++ b/fileitemactionplugin/kdeconnectsendfile.desktop @@ -18,6 +18,7 @@ Name[sk]=Poslať súbor cez službu KDE Connect Name[sv]=Skicka via tjänsten KDE-anslut Name[uk]=Надсилання файла за допомогою служби з’єднання KDE Name[x-test]=xxSend file via KDE Connect servicexx +Name[zh_CN]=通过 KDE Connect 服务发送文件 Name[zh_TW]=使用 KDE Connect 服務傳送檔案 X-KDE-Library=kdeconnectfileitemaction X-KDE-Submenu=Connect @@ -54,6 +55,7 @@ X-KDE-Submenu[sv]=Anslut X-KDE-Submenu[tr]=Bağlan X-KDE-Submenu[uk]=З’єднання X-KDE-Submenu[x-test]=xxConnectxx +X-KDE-Submenu[zh_CN]=连接 X-KDE-Submenu[zh_TW]=連線 Icon=preferences-system-network diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications.json b/plugins/sendnotifications/kdeconnect_sendnotifications.json index 6b49a5864..79cae4b41 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications.json +++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json @@ -70,6 +70,7 @@ "Description[tr]": "Bu bilgisayarın bildirimlerini yayınlayın, böylece diğer cihazlarda gösterilebilirler.", "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", @@ -105,6 +106,7 @@ "Name[tr]": "Bildirim gönder", "Name[uk]": "Надіслати сповіщення", "Name[x-test]": "xxSend notificationsxx", + "Name[zh_CN]": "发送通知", "Name[zh_TW]": "傳送通知", "ServiceTypes": [ "KdeConnect/Plugin" diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index 8260db17d..0d6050367 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -64,6 +64,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",