From 20cb1492e7815cf46e231839fe0fd982ce19ceff Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 19 Feb 2016 09:23:18 +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 816575aefe..1f6af812ec 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -104,6 +104,7 @@ Exec=dolphin
 [Desktop Action compact]
 Name=Compact
 Name[ar]=متراصّ
+Name[ast]=Compautu
 Name[ca]=Compacta
 Name[ca@valencia]=Compacta
 Name[cs]=Kompaktní