From bb39ef84b5bb6f878c20be545f590d2f069d4bcb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 16 Dec 2021 01:53:14 +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 ++-- plugins/runcommand/kdeconnect_runcommand.json | 4 ++-- plugins/share/kdeconnect_share.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/findthisdevice/kdeconnect_findthisdevice.json b/plugins/findthisdevice/kdeconnect_findthisdevice.json index 430a5faa3..d52f61d20 100644 --- a/plugins/findthisdevice/kdeconnect_findthisdevice.json +++ b/plugins/findthisdevice/kdeconnect_findthisdevice.json @@ -126,8 +126,8 @@ "Version": "0.1", "Website": "https://kde.org" }, + "X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_findthisdevice_config", "X-KdeConnect-SupportedPacketType": [ "kdeconnect.findmyphone.request" - ], - "X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_findthisdevice_config" + ] } diff --git a/plugins/pausemusic/kdeconnect_pausemusic.json b/plugins/pausemusic/kdeconnect_pausemusic.json index 952c498b8..fcefb6433 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic.json +++ b/plugins/pausemusic/kdeconnect_pausemusic.json @@ -142,8 +142,8 @@ "Version": "0.1", "Website": "https://albertvaka.wordpress.com" }, + "X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_pausemusic_config", "X-KdeConnect-SupportedPacketType": [ "kdeconnect.telephony" - ], - "X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_pausemusic_config" + ] } diff --git a/plugins/runcommand/kdeconnect_runcommand.json b/plugins/runcommand/kdeconnect_runcommand.json index 07994c712..3834aa1d5 100644 --- a/plugins/runcommand/kdeconnect_runcommand.json +++ b/plugins/runcommand/kdeconnect_runcommand.json @@ -189,11 +189,11 @@ "Version": "0.1", "Website": "https://albertvaka.wordpress.com" }, + "X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_runcommand_config", "X-KdeConnect-OutgoingPacketType": [ "kdeconnect.runcommand" ], "X-KdeConnect-SupportedPacketType": [ "kdeconnect.runcommand.request" - ], - "X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_runcommand_config" + ] } diff --git a/plugins/share/kdeconnect_share.json b/plugins/share/kdeconnect_share.json index 7f07d0868..42b65420b 100644 --- a/plugins/share/kdeconnect_share.json +++ b/plugins/share/kdeconnect_share.json @@ -143,12 +143,12 @@ "Version": "0.1", "Website": "https://albertvaka.wordpress.com" }, + "X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_share_config", "X-KdeConnect-OutgoingPacketType": [ "kdeconnect.share.request", "kdeconnect.share.request.update" ], "X-KdeConnect-SupportedPacketType": [ "kdeconnect.share.request" - ], - "X-KDE-ConfigModule": "kdeconnect/kcms/kdeconnect_share_config" + ] }