From a8a4981b2c58090c01cc96da933022909d6adf6b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 16 Jun 2015 13:31:20 +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 ea802b431..e483d0539 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -8,6 +8,7 @@ Name[es]=Dolphin
 Name[fi]=Dolphin
 Name[fr]=Dolphin
 Name[gl]=Dolphin
+Name[ia]=Dolphin
 Name[id]=Dolphin
 Name[it]=Dolphin
 Name[ja]=Dolphin
@@ -45,6 +46,7 @@ GenericName[es]=Gestor de archivos
 GenericName[fi]=Tiedostonhallinta
 GenericName[fr]=Gestionnaire de fichiers
 GenericName[gl]=Xestor de ficheiros
+GenericName[ia]=Gerente de file
 GenericName[id]=Manajer Berkas
 GenericName[it]=Gestore dei file
 GenericName[ja]=ファイルマネージャ
-- 
cgit v1.3