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/org.kde.dolphin.desktop | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/org.kde.dolphin.desktop')

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 63b4d1f59..b23fec03c 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Dolphin
+Name[ast]=Dolphin
 Name[ca]=Dolphin
 Name[ca@valencia]=Dolphin
 Name[cs]=Dolphin
@@ -44,6 +45,7 @@ Type=Application
 X-DocPath=dolphin/index.html
 Categories=Qt;KDE;System;FileTools;FileManager;
 GenericName=File Manager
+GenericName[ast]=Xestor de ficheros
 GenericName[ca]=Gestor de fitxers
 GenericName[ca@valencia]=Gestor de fitxers
 GenericName[cs]=Správce souborů
-- 
cgit v1.3