From: l10n daemon script <scripty@kde.org>
Date: Tue, 17 Nov 2015 12:50:56 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/e0dfcb9e1dc6a9dc210792231b84bd59e907366b

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 8941e8465..e875a53a2 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -54,6 +54,7 @@ Actions=icons;details;compact;
 
 [Desktop Action icons]
 Name=Icons
+Name[ast]=Iconos
 Name[ca]=Icones
 Name[ca@valencia]=Icones
 Name[cs]=Ikony