From d6251f726e26e284db90801eea8213b6f49dda23 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 25 May 2022 01:45:00 +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/virtualmonitor/kdeconnect_virtualmonitor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json index 036fcc321..cb5865507 100644 --- a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json +++ b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json @@ -6,12 +6,12 @@ "Name": "Aleix Pol i Gonzalez" } ], - "Name": "Virtual Monitor", "Description": "Use your devices as virtual monitors", "EnabledByDefault": true, "Icon": "video-monitor", "Id": "kdeconnect_virtualmonitor", "License": "GPL", + "Name": "Virtual Monitor", "ServiceTypes": [ "KdeConnect/Plugin" ],