From 0daae5336714c2124171ca89415eb8bf6098519d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 24 Apr 2015 09:52:38 +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 81bf729c6..2193f9533 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -10,6 +10,7 @@ Name[gl]=Dolphin
 Name[id]=Dolphin
 Name[it]=Dolphin
 Name[nl]=Dolphin
+Name[nn]=Dolphin
 Name[pl]=Dolphin
 Name[pt]=Dolphin
 Name[pt_BR]=Dolphin
@@ -39,6 +40,7 @@ GenericName[gl]=Xestor de ficheiros
 GenericName[id]=Manajer Berkas
 GenericName[it]=Gestore dei file
 GenericName[nl]=Bestandsbeheerder
+GenericName[nn]=Filhandsamar
 GenericName[pl]=Zarządzanie plikami
 GenericName[pt]=Gestor de Ficheiros
 GenericName[pt_BR]=Gerenciador de arquivos
-- 
cgit v1.3