From 2d8448f88d21c8eb8ac89498ca34fc6c12eab3db Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 9 Dec 2015 09:04:05 +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"
---
 src/dolphinpart.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index d1549f2d85..d063af3a9e 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -59,6 +59,7 @@ Name[ast]=Iconos
 Name[ca]=Icones
 Name[ca@valencia]=Icones
 Name[cs]=Ikony
+Name[da]=Ikoner
 Name[de]=Symbole
 Name[el]=Εικονίδια
 Name[en_GB]=Icons