From 3b8623b0403a85751a3b48648a541f9534cd3d78 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 20 Jan 2016 12:38:42 +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 b23fec03c..7b8e19414 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Dolphin
+Name[ar]=دولفين
 Name[ast]=Dolphin
 Name[ca]=Dolphin
 Name[ca@valencia]=Dolphin
@@ -45,6 +46,7 @@ Type=Application
 X-DocPath=dolphin/index.html
 Categories=Qt;KDE;System;FileTools;FileManager;
 GenericName=File Manager
+GenericName[ar]=مدير ملفّات
 GenericName[ast]=Xestor de ficheros
 GenericName[ca]=Gestor de fitxers
 GenericName[ca@valencia]=Gestor de fitxers
-- 
cgit v1.3