From c1eeb0e115b6074e296892c95192cf464c0c83c9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 13 Jan 2017 05:50:46 +0100
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 | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/dolphinpart.desktop')

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 9b3089542..da0a659d3 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -152,6 +152,7 @@ Exec=dolphin
 [Desktop Action details]
 Name=Details
 Name[ar]=التّفاصيل
+Name[ast]=Detalles
 Name[ca]=Detalls
 Name[ca@valencia]=Detalls
 Name[cs]=Podrobnosti
-- 
cgit v1.3