From 0898ee2e8079c0db93674c8a673a0d89b22f5056 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 9 Feb 2022 01:48:59 +0000
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"
---
 plasma_phone_components.notifyrc                  | 3 +++
 quicksettings/airplanemode/metadata.desktop       | 1 +
 quicksettings/nightcolor/package/metadata.desktop | 1 +
 3 files changed, 5 insertions(+)

diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc
index 7721ab08..5f93ad81 100644
--- a/plasma_phone_components.notifyrc
+++ b/plasma_phone_components.notifyrc
@@ -8,6 +8,7 @@ Name[ast]=Plasma
 Name[ca]=Plasma
 Name[ca@valencia]=Plasma
 Name[cs]=Plasma
+Name[da]=Plasma
 Name[de]=Plasma
 Name[en_GB]=Plasma
 Name[es]=Plasma
@@ -38,6 +39,7 @@ Name=Captured
 Name[ca]=Capturat
 Name[ca@valencia]=Capturat
 Name[cs]=Zachyceno
+Name[da]=Indfanget
 Name[de]=Aufgenommen
 Name[en_GB]=Captured
 Name[es]=Capturado
@@ -65,6 +67,7 @@ Comment=Captured
 Comment[ca]=Capturat
 Comment[ca@valencia]=Capturat
 Comment[cs]=Zachyceno
+Comment[da]=Indfanget
 Comment[de]=Aufgenommen
 Comment[en_GB]=Captured
 Comment[es]=Capturado
diff --git a/quicksettings/airplanemode/metadata.desktop b/quicksettings/airplanemode/metadata.desktop
index d857eebb..f35505a5 100644
--- a/quicksettings/airplanemode/metadata.desktop
+++ b/quicksettings/airplanemode/metadata.desktop
@@ -6,6 +6,7 @@ Name=Airplane Mode
 Name[ca]=Mode avió
 Name[ca@valencia]=Mode avió
 Name[cs]=Režim v Letadle
+Name[da]=Flytilstand
 Name[de]=Flugzeug-Modus
 Name[en_GB]=Airplane Mode
 Name[es]=Modo avión
diff --git a/quicksettings/nightcolor/package/metadata.desktop b/quicksettings/nightcolor/package/metadata.desktop
index 89629cb0..a9db4247 100644
--- a/quicksettings/nightcolor/package/metadata.desktop
+++ b/quicksettings/nightcolor/package/metadata.desktop
@@ -6,6 +6,7 @@ Name=Night Color
 Name[ca]=Color de nit
 Name[ca@valencia]=Color de nit
 Name[cs]=Noční barva
+Name[da]=Natfarver
 Name[de]=Nachtfarben
 Name[en_GB]=Night Colour
 Name[es]=Color nocturno