From da6b89dda000fdcec0f46c860f2df6c98d22e945 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 7 Dec 2018 08:23:17 +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"
---
 effects/logout/package/metadata.desktop | 1 +
 effects/scale/scale_config.desktop      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop
index 7a6da40ef4..cb133391e7 100644
--- a/effects/logout/package/metadata.desktop
+++ b/effects/logout/package/metadata.desktop
@@ -3,6 +3,7 @@ Name=Logout
 Name[ca]=Sortida
 Name[ca@valencia]=Eixida
 Name[cs]=Odhlášení
+Name[da]=Log ud
 Name[de]=Abmeldung
 Name[el]=Αποσύνδεση
 Name[en_GB]=Logout
diff --git a/effects/scale/scale_config.desktop b/effects/scale/scale_config.desktop
index 60a0a66e39..2d06f4c1ac 100644
--- a/effects/scale/scale_config.desktop
+++ b/effects/scale/scale_config.desktop
@@ -9,6 +9,7 @@ Name=Scale
 Name[ca]=Escala
 Name[ca@valencia]=Escala
 Name[cs]=Měřítko
+Name[da]=Skalér
 Name[de]=Skalieren
 Name[el]=Κλιμάκωση
 Name[en_GB]=Scale