From: l10n daemon script <scripty@kde.org>
Date: Fri, 19 Feb 2016 09:23:18 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/20cb1492e7815cf46e231839fe0fd982ce19ceff

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"
---

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 816575aef..1f6af812e 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í