From f1c5cd302ad382613edc0a1cb2c88bcb2a670b95 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 4 May 2015 10:09:13 +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 | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/dolphinpart.desktop')

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 24ce9c2f4..08734f814 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -10,6 +10,7 @@ Name[fr]=Vue de Dolphin
 Name[gl]=Vista de Dolphin
 Name[id]=Tampilan Dolphin
 Name[it]=Vista di Dolphin
+Name[ja]=Dolphin ビュー
 Name[ko]=Dolphin 보기
 Name[nb]=Dolphin visning
 Name[nl]=Dolphin-weergave
@@ -52,6 +53,7 @@ Name[fr]=Icônes
 Name[gl]=Iconas
 Name[id]=Ikon
 Name[it]=Icone
+Name[ja]=アイコン
 Name[ko]=아이콘
 Name[nb]=Ikoner
 Name[nl]=Pictogrammen
@@ -116,6 +118,7 @@ Name[fr]=Détails
 Name[gl]=Detalles
 Name[id]=Detail
 Name[it]=Dettagli
+Name[ja]=詳細
 Name[ko]=자세히
 Name[nb]=Detaljer
 Name[nl]=Details
-- 
cgit v1.3