From 7806fe73cf46d39140bb280af3deb25c8938f1e9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 1 Jun 2020 05:51:26 +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"
---
 plugins/bigscreen/kdeconnect_bigscreen.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json
index dbcf6632e..1be65be06 100644
--- a/plugins/bigscreen/kdeconnect_bigscreen.json
+++ b/plugins/bigscreen/kdeconnect_bigscreen.json
@@ -3,15 +3,18 @@
         "Authors": [
             {
                 "Email": "aix.m@outlook.com",
-                "Name": "Aditya Mehra"
+                "Name": "Aditya Mehra",
+                "Name[x-test]": "xxAditya Mehraxx"
             }
         ],
         "Description": "Bigscreen Plugin",
+        "Description[x-test]": "xxBigscreen Pluginxx",
         "EnabledByDefault": true,
         "Icon": "tvtrusted",
         "Id": "kdeconnect_bigscreen",
         "License": "GPL",
         "Name": "Bigscreen",
+        "Name[x-test]": "xxBigscreenxx",
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ],