From bc8f3373fd98121fbe230842bbb104889961e6d7 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 4 Nov 2015 16:55:32 +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 d5c50aa8b..63b4d1f59 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Dolphin
 Name[ca]=Dolphin
+Name[ca@valencia]=Dolphin
 Name[cs]=Dolphin
 Name[de]=Dolphin
 Name[el]=Dolphin
@@ -44,6 +45,7 @@ X-DocPath=dolphin/index.html
 Categories=Qt;KDE;System;FileTools;FileManager;
 GenericName=File Manager
 GenericName[ca]=Gestor de fitxers
+GenericName[ca@valencia]=Gestor de fitxers
 GenericName[cs]=Správce souborů
 GenericName[de]=Dateiverwaltung
 GenericName[el]=Διαχειριστής αρχείων
-- 
cgit v1.3