From 0fc2c24039bc0cf7ff0f4db4697254fea6947eeb Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 7 Dec 2015 10:14:12 +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 | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/dolphinpart.desktop')

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index e875a53a2..063ab152f 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Type=Service
 Name=Dolphin View
+Name[ast]=Vista de Dolphin
 Name[ca]=Vista del Dolphin
 Name[ca@valencia]=Vista del Dolphin
 Name[cs]=Pohled Dolphin
@@ -140,6 +141,7 @@ Exec=dolphin
 
 [Desktop Action details]
 Name=Details
+Name[ast]=Detalles
 Name[ca]=Detalls
 Name[ca@valencia]=Detalls
 Name[cs]=Podrobnosti
-- 
cgit v1.3