From fe6a7ac9f8b5ce6180fe265ac95b524ecc7805f6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 29 May 2016 12:20:08 +0000
Subject: 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"
---
 src/dolphinpart.desktop | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/dolphinpart.desktop')

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 830fab2a2..e8814f16b 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -6,6 +6,7 @@ Name[ast]=Vista de Dolphin
 Name[ca]=Vista del Dolphin
 Name[ca@valencia]=Vista del Dolphin
 Name[cs]=Pohled Dolphin
+Name[da]=Dolphin-visning
 Name[de]=Dolphin-Ansicht
 Name[el]=Dolphin View
 Name[en_GB]=Dolphin View
@@ -108,6 +109,7 @@ Name[ast]=Compautu
 Name[ca]=Compacta
 Name[ca@valencia]=Compacta
 Name[cs]=Kompaktní
+Name[da]=Kompakt
 Name[de]=Kompakt
 Name[el]=Σύμπτυξη
 Name[en_GB]=Compact
@@ -152,6 +154,7 @@ Name[ast]=Detalles
 Name[ca]=Detalls
 Name[ca@valencia]=Detalls
 Name[cs]=Podrobnosti
+Name[da]=Detaljer
 Name[de]=Details
 Name[el]=Λεπτομέρειες
 Name[en_GB]=Details
-- 
cgit v1.3