From 0a0761bf8aeb61f22982dece124208e939774b54 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 1 Sep 2022 01:41:48 +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"
---
 quicksettings/record/metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quicksettings/record/metadata.json b/quicksettings/record/metadata.json
index 453a510b..38a3416b 100644
--- a/quicksettings/record/metadata.json
+++ b/quicksettings/record/metadata.json
@@ -28,11 +28,11 @@
                 "Name[zh_CN]": "Aleix Pol i Gonzalez"
             }
         ],
+        "Description": "Screen recording quick setting",
         "Icon": "media-record",
         "Id": "org.kde.plasma.quicksetting.record",
         "License": "GPL-2.0+",
         "Name": "Record Screen",
-        "Description": "Screen recording quick setting",
         "ServiceTypes": [
             "KPackage/GenericQML"
         ],