From 1c1efb983c60ea57422317186047f744e23df114 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 4 Jun 2015 11:19:31 +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 2d099cd6c..ea802b431 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -4,6 +4,7 @@ Name[ca]=Dolphin
 Name[cs]=Dolphin
 Name[de]=Dolphin
 Name[en_GB]=Dolphin
+Name[es]=Dolphin
 Name[fi]=Dolphin
 Name[fr]=Dolphin
 Name[gl]=Dolphin
@@ -40,6 +41,7 @@ GenericName[ca]=Gestor de fitxers
 GenericName[cs]=Správce souborů
 GenericName[de]=Dateiverwaltung
 GenericName[en_GB]=File Manager
+GenericName[es]=Gestor de archivos
 GenericName[fi]=Tiedostonhallinta
 GenericName[fr]=Gestionnaire de fichiers
 GenericName[gl]=Xestor de ficheiros
-- 
cgit v1.3.1