From 727364a38d0bd280e1142b68b011f55a3167fd61 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 13 Aug 2024 01:21:06 +0000 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/findthisdevice/kdeconnect_findthisdevice.json | 4 ++-- plugins/pausemusic/kdeconnect_pausemusic.json | 4 ++-- .../screensaver-inhibit/kdeconnect_screensaver_inhibit.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/findthisdevice/kdeconnect_findthisdevice.json b/plugins/findthisdevice/kdeconnect_findthisdevice.json index aa6656db8..747fe2106 100644 --- a/plugins/findthisdevice/kdeconnect_findthisdevice.json +++ b/plugins/findthisdevice/kdeconnect_findthisdevice.json @@ -110,8 +110,8 @@ "Name[zh_TW]": "尋找這個裝置" }, "X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_findthisdevice_config", + "X-KdeConnect-OutgoingPacketType": [], "X-KdeConnect-SupportedPacketType": [ "kdeconnect.findmyphone.request" - ], - "X-KdeConnect-OutgoingPacketType": [] + ] } diff --git a/plugins/pausemusic/kdeconnect_pausemusic.json b/plugins/pausemusic/kdeconnect_pausemusic.json index 008792b5f..8f4ae3d3d 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic.json +++ b/plugins/pausemusic/kdeconnect_pausemusic.json @@ -115,8 +115,8 @@ "Name[zh_TW]": "在通話過程中暫停媒體" }, "X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_pausemusic_config", + "X-KdeConnect-OutgoingPacketType": [], "X-KdeConnect-SupportedPacketType": [ "kdeconnect.telephony" - ], - "X-KdeConnect-OutgoingPacketType": [] + ] } diff --git a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json index b8b4a0f91..d851e0ab6 100644 --- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json +++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json @@ -113,6 +113,6 @@ "Name[zh_CN]": "禁止屏保", "Name[zh_TW]": "停止螢幕保護" }, - "X-KdeConnect-SupportedPacketType": [], - "X-KdeConnect-OutgoingPacketType": [] + "X-KdeConnect-OutgoingPacketType": [], + "X-KdeConnect-SupportedPacketType": [] }