From 8eee929e22acca20b5cb3a0e3bb6561f6d831391 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 5 Jun 2020 05:03:19 +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   | 6 ++++++
 urlhandler/org.kde.kdeconnect.handler.desktop | 1 +
 2 files changed, 7 insertions(+)

diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json
index c508874ca..0dff4dbf5 100644
--- a/plugins/bigscreen/kdeconnect_bigscreen.json
+++ b/plugins/bigscreen/kdeconnect_bigscreen.json
@@ -11,8 +11,10 @@
                 "Name[it]": "Aditya Mehra",
                 "Name[lt]": "Aditya Mehra",
                 "Name[nl]": "Aditya Mehra",
+                "Name[nn]": "Aditya Mehra",
                 "Name[pt]": "Aditya Mehra",
                 "Name[pt_BR]": "Aditya Mehra",
+                "Name[sk]": "Aditya Mehra",
                 "Name[uk]": "Aditya Mehra",
                 "Name[x-test]": "xxAditya Mehraxx"
             }
@@ -25,7 +27,9 @@
         "Description[it]": "Estensione Bigscreen",
         "Description[lt]": "Bigscreen papildinys",
         "Description[nl]": "Bigscreen plug-in",
+        "Description[nn]": "Bigscreen-tillegg",
         "Description[pt]": "'Plugin' de Ecrã Grande",
+        "Description[sk]": "Doplnok veľkej obrazovky",
         "Description[uk]": "Додаток для великих екранів",
         "Description[x-test]": "xxBigscreen Pluginxx",
         "EnabledByDefault": true,
@@ -40,7 +44,9 @@
         "Name[it]": "Bigscreen",
         "Name[lt]": "Bigscreen",
         "Name[nl]": "Bigscreen",
+        "Name[nn]": "Bigscreen",
         "Name[pt]": "Ecrã grande",
+        "Name[sk]": "Veľká obrazovka",
         "Name[uk]": "Великий екран",
         "Name[x-test]": "xxBigscreenxx",
         "ServiceTypes": [
diff --git a/urlhandler/org.kde.kdeconnect.handler.desktop b/urlhandler/org.kde.kdeconnect.handler.desktop
index febd4382f..e53145fb6 100644
--- a/urlhandler/org.kde.kdeconnect.handler.desktop
+++ b/urlhandler/org.kde.kdeconnect.handler.desktop
@@ -8,6 +8,7 @@ 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[nn]=KDE Connect adressehandsamar
 Name[pt]=Tratamento de URL's do KDE Connect
 Name[pt_BR]=Tratamento de URLs do KDE Connect
 Name[sv]=KDE-anslut webbadresshanterare