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/settings/kcm/kcmdolphinservices.desktop | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/settings/kcm/kcmdolphinservices.desktop')

diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index 2c33eefec..b865b6cc9 100644
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -4,6 +4,7 @@ Name[ast]=Servicios de Dolphin
 Name[ca]=Serveis del Dolphin
 Name[ca@valencia]=Serveis del Dolphin
 Name[cs]=Služby Dolphinu
+Name[da]=Dolphin-tjenester
 Name[de]=Dolphin-Dienste
 Name[el]=Dolphin Υπηρεσίες
 Name[en_GB]=Dolphin Services
@@ -55,6 +56,7 @@ Name[ast]=Servicios
 Name[ca]=Serveis
 Name[ca@valencia]=Serveis
 Name[cs]=Služby
+Name[da]=Tjenester
 Name[de]=KDE-Dienste
 Name[el]=Υπηρεσίες
 Name[en_GB]=Services
@@ -95,6 +97,7 @@ Comment[ast]=Configura los servicios del xestor de ficheros
 Comment[ca]=Configura els serveis del gestor de fitxers
 Comment[ca@valencia]=Configura els serveis del gestor de fitxers
 Comment[cs]=Nastavení služeb správce souborů
+Comment[da]=Indstil filhåndteringstjenester
 Comment[de]=Dateiverwaltungs-Dienste einrichten
 Comment[el]=Διαμόρφωση υπηρεσιών του διαχειριστή αρχείων
 Comment[en_GB]=Configure file manager services
@@ -134,6 +137,7 @@ X-KDE-Keywords[ast]=xestor de ficheros
 X-KDE-Keywords[ca]=gestor de fitxers
 X-KDE-Keywords[ca@valencia]=gestor de fitxers
 X-KDE-Keywords[cs]=správce souborů
+X-KDE-Keywords[da]=filhåndtering
 X-KDE-Keywords[de]=Dateiverwaltung
 X-KDE-Keywords[el]=διαχειριστής αρχείων
 X-KDE-Keywords[en_GB]=file manager
-- 
cgit v1.3