From 10f48085df2fd193067f2eb85eda19db8d081c8f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 20 Jan 2020 06:02:02 +0100
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"
---
 kcms/feedback/kcm_feedback.desktop             | 3 +++
 kcms/feedback/package/metadata.desktop         | 1 +
 login-sessions/plasma.desktop.cmake            | 2 +-
 login-sessions/plasmawayland-dev.desktop.cmake | 1 +
 login-sessions/plasmawayland.desktop.cmake     | 1 +
 login-sessions/plasmax11-dev.desktop.cmake     | 1 +
 menu/desktop/kf5-network.directory             | 1 +
 7 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/kcms/feedback/kcm_feedback.desktop b/kcms/feedback/kcm_feedback.desktop
index 53c17ddc2..516baf705 100644
--- a/kcms/feedback/kcm_feedback.desktop
+++ b/kcms/feedback/kcm_feedback.desktop
@@ -13,6 +13,7 @@ X-KDE-System-Settings-Parent-Category=personalization
 Name=User Feedback
 Name[ca]=Comentaris de l'usuari
 Name[cs]=Zpětná vazba uživatele
+Name[da]=Brugerfeedback
 Name[en_GB]=User Feedback
 Name[es]=Comentarios del usuario
 Name[et]=Kasutaja tagasiside
@@ -23,6 +24,7 @@ Name[gl]=Achegas de usuario
 Name[hu]=Felhasználói visszajelzés
 Name[id]=Tanggapan Pengguna
 Name[it]=Segnalazioni dell'utente
+Name[ja]=ユーザ フィードバック
 Name[lt]=Naudotojo grįžtamasis ryšys
 Name[nl]=Terugkoppeling van gebruiker
 Name[nn]=Tilbakemeldingar
@@ -40,6 +42,7 @@ Name[zh_TW]=使用者意見回應
 Comment=Configure user feedback settings
 Comment[ca]=Configura els ajustaments dels comentaris de l'usuari
 Comment[cs]=Nastavení voleb uživatelské zpětné vazby
+Comment[da]=Indstillinger for brugerfeedback
 Comment[en_GB]=Configure user feedback settings
 Comment[es]=Configurar las preferencias de los comentarios del usuario
 Comment[et]=Kasutaja tagasiside seadistamine
diff --git a/kcms/feedback/package/metadata.desktop b/kcms/feedback/package/metadata.desktop
index e472c8373..e679db69c 100644
--- a/kcms/feedback/package/metadata.desktop
+++ b/kcms/feedback/package/metadata.desktop
@@ -2,6 +2,7 @@
 Name=Feedback
 Name[ca]=Comentaris
 Name[cs]=Zpětná vazba
+Name[da]=Feedback
 Name[de]=Rückmeldung
 Name[en_GB]=Feedback
 Name[es]=Comentarios
diff --git a/login-sessions/plasma.desktop.cmake b/login-sessions/plasma.desktop.cmake
index d3498809b..1f4a5875b 100644
--- a/login-sessions/plasma.desktop.cmake
+++ b/login-sessions/plasma.desktop.cmake
@@ -25,7 +25,7 @@ Name[hu]=Plasma
 Name[id]=Plasma
 Name[is]=Plasma
 Name[it]=Plasma
-Name[ja]=プラズマ
+Name[ja]=Plasma
 Name[ko]=Plasma
 Name[lt]=Plasma
 Name[lv]=Plasma
diff --git a/login-sessions/plasmawayland-dev.desktop.cmake b/login-sessions/plasmawayland-dev.desktop.cmake
index d491fb14e..49ee57ec5 100644
--- a/login-sessions/plasmawayland-dev.desktop.cmake
+++ b/login-sessions/plasmawayland-dev.desktop.cmake
@@ -4,6 +4,7 @@ DesktopNames=KDE
 Name=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[ast]=Plasma (Desendolcu, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[ca]=Plasma (Desenvolupament, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
+Name[da]=Plasma (udvikling, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[de]=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[en_GB]=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[es]=Plasma (Desarrollo, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
diff --git a/login-sessions/plasmawayland.desktop.cmake b/login-sessions/plasmawayland.desktop.cmake
index fbba17910..1071cda14 100644
--- a/login-sessions/plasmawayland.desktop.cmake
+++ b/login-sessions/plasmawayland.desktop.cmake
@@ -6,6 +6,7 @@ Name=Plasma (Wayland)
 Name[ast]=Plasma (Wayland)
 Name[ca]=Plasma (Wayland)
 Name[cs]=Plasma (Wayland)
+Name[da]=Plasma (Wayland)
 Name[de]=Plasma (Wayland)
 Name[en_GB]=Plasma (Wayland)
 Name[es]=Plasma (Wayland)
diff --git a/login-sessions/plasmax11-dev.desktop.cmake b/login-sessions/plasmax11-dev.desktop.cmake
index ab3cc43f8..c1ef2a48e 100644
--- a/login-sessions/plasmax11-dev.desktop.cmake
+++ b/login-sessions/plasmax11-dev.desktop.cmake
@@ -5,6 +5,7 @@ DesktopNames=KDE
 Name=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[ast]=Plasma (Desendolcu, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[ca]=Plasma (Desenvolupament, X11 ${CMAKE_INSTALL_FULL_BINDIR})
+Name[da]=Plasma (udvikling, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[de]=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[en_GB]=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[es]=Plasma (Desarrollo, X11 ${CMAKE_INSTALL_FULL_BINDIR})
diff --git a/menu/desktop/kf5-network.directory b/menu/desktop/kf5-network.directory
index 9a5b24d91..d9a2e1651 100644
--- a/menu/desktop/kf5-network.directory
+++ b/menu/desktop/kf5-network.directory
@@ -4,6 +4,7 @@ Name=Network
 Name[ast]=Rede
 Name[ca]=Xarxa
 Name[cs]=Síť
+Name[da]=Netværk
 Name[de]=Netzwerk
 Name[en_GB]=Network
 Name[es]=Red