From 84072ff32d31e90bb9d4b95b0148f4ef23c2c756 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 2 Jun 2020 05:19:27 +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   | 13 +++++++++++++
 urlhandler/org.kde.kdeconnect.handler.desktop |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json
index 1be65be06..d27c9a8cd 100644
--- a/plugins/bigscreen/kdeconnect_bigscreen.json
+++ b/plugins/bigscreen/kdeconnect_bigscreen.json
@@ -4,16 +4,29 @@
             {
                 "Email": "aix.m@outlook.com",
                 "Name": "Aditya Mehra",
+                "Name[cs]": "Aditya Mehra",
+                "Name[lt]": "Aditya Mehra",
+                "Name[nl]": "Aditya Mehra",
+                "Name[pt_BR]": "Aditya Mehra",
+                "Name[uk]": "Aditya Mehra",
                 "Name[x-test]": "xxAditya Mehraxx"
             }
         ],
         "Description": "Bigscreen Plugin",
+        "Description[cs]": "Modul pro velkou obrazovku",
+        "Description[lt]": "Bigscreen papildinys",
+        "Description[nl]": "Bigscreen plug-in",
+        "Description[uk]": "Додаток для великих екранів",
         "Description[x-test]": "xxBigscreen Pluginxx",
         "EnabledByDefault": true,
         "Icon": "tvtrusted",
         "Id": "kdeconnect_bigscreen",
         "License": "GPL",
         "Name": "Bigscreen",
+        "Name[cs]": "Velká obrazovka",
+        "Name[lt]": "Bigscreen",
+        "Name[nl]": "Bigscreen",
+        "Name[uk]": "Великий екран",
         "Name[x-test]": "xxBigscreenxx",
         "ServiceTypes": [
             "KdeConnect/Plugin"
diff --git a/urlhandler/org.kde.kdeconnect.handler.desktop b/urlhandler/org.kde.kdeconnect.handler.desktop
index 3fe7af4c2..febd4382f 100644
--- a/urlhandler/org.kde.kdeconnect.handler.desktop
+++ b/urlhandler/org.kde.kdeconnect.handler.desktop
@@ -5,9 +5,11 @@ Name[cs]=Nástroj pro práci s URL v KDE Connect
 Name[es]=Controlador de URL de KDE Connect
 Name[et]=KDE Connecti URL-ide käitleja
 Name[fr]=Gestionnaire d'URL de KDE Connect
+Name[it]=Gestore URL di KDE Connect
 Name[lt]=KDE Connect URL doroklė
 Name[nl]=URL behandelaar van KDE-Connect
 Name[pt]=Tratamento de URL's do KDE Connect
+Name[pt_BR]=Tratamento de URLs do KDE Connect
 Name[sv]=KDE-anslut webbadresshanterare
 Name[uk]=Обробник адрес KDE Connect
 Name[x-test]=xxKDE Connect URL Handlerxx