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/dolphinpart.desktop | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/dolphinpart.desktop')

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index e54adcea5..586c9b15c 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -9,6 +9,7 @@ Name[es]=Vista de Dolphin
 Name[fi]=Dolphin-näkymä
 Name[fr]=Vue de Dolphin
 Name[gl]=Vista de Dolphin
+Name[ia]=Vista de Dolphin
 Name[id]=Tampilan Dolphin
 Name[it]=Vista di Dolphin
 Name[ja]=Dolphin ビュー
@@ -55,6 +56,7 @@ Name[es]=Iconos
 Name[fi]=Kuvakkeet
 Name[fr]=Icônes
 Name[gl]=Iconas
+Name[ia]=Icones
 Name[id]=Ikon
 Name[it]=Icone
 Name[ja]=アイコン
@@ -92,6 +94,7 @@ Name[es]=Compacto
 Name[fi]=Tiivis
 Name[fr]=Concis
 Name[gl]=Compacta
+Name[ia]=Compacte
 Name[id]=Sederhana
 Name[it]=Compatta
 Name[ko]=축소됨
@@ -126,6 +129,7 @@ Name[es]=Detalles
 Name[fi]=Yksityiskohdat
 Name[fr]=Détails
 Name[gl]=Detalles
+Name[ia]=Detalios
 Name[id]=Detail
 Name[it]=Dettagli
 Name[ja]=詳細
-- 
cgit v1.3