From ef73ce6f62068124085cf836680c518f2d67d01a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 22 Jul 2020 06:06:44 +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 | 3 +++ urlhandler/org.kde.kdeconnect.handler.desktop | 1 + 2 files changed, 4 insertions(+) diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json index 0d3e2fa04..abdb4b09a 100644 --- a/plugins/bigscreen/kdeconnect_bigscreen.json +++ b/plugins/bigscreen/kdeconnect_bigscreen.json @@ -7,6 +7,7 @@ "Name[ca@valencia]": "Aditya Mehra", "Name[ca]": "Aditya Mehra", "Name[cs]": "Aditya Mehra", + "Name[da]": "Aditya Mehra", "Name[en_GB]": "Aditya Mehra", "Name[es]": "Aditya Mehra", "Name[et]": "Aditya Mehra", @@ -31,6 +32,7 @@ "Description[ca@valencia]": "Connector de la Bigscreen", "Description[ca]": "Connector de la Bigscreen", "Description[cs]": "Modul pro velkou obrazovku", + "Description[da]": "Plugin til storskærm", "Description[en_GB]": "Bigscreen Plugin", "Description[es]": "Complemento Bigscreen", "Description[et]": "Suurekraani plugin", @@ -57,6 +59,7 @@ "Name[ca@valencia]": "Bigscreen", "Name[ca]": "Bigscreen", "Name[cs]": "Velká obrazovka", + "Name[da]": "Storskærm", "Name[en_GB]": "Bigscreen", "Name[es]": "Bigscreen", "Name[et]": "Suurekraan", diff --git a/urlhandler/org.kde.kdeconnect.handler.desktop b/urlhandler/org.kde.kdeconnect.handler.desktop index e6b24a775..a32ccb385 100644 --- a/urlhandler/org.kde.kdeconnect.handler.desktop +++ b/urlhandler/org.kde.kdeconnect.handler.desktop @@ -3,6 +3,7 @@ Name=KDE Connect URL Handler Name[ca]=Gestor d'URL del KDE Connect Name[ca@valencia]=Gestor d'URL del KDE Connect Name[cs]=Nástroj pro práci s URL v KDE Connect +Name[da]=URL-håndtering til KDE Connect Name[en_GB]=KDE Connect URL Handler Name[es]=Controlador de URL de KDE Connect Name[et]=KDE Connecti URL-ide käitleja