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/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 cb5afd224..b9c916fae 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -9,6 +9,7 @@ Name[fr]=Dolphin
 Name[gl]=Dolphin
 Name[id]=Dolphin
 Name[it]=Dolphin
+Name[ja]=Dolphin
 Name[ko]=Dolphin
 Name[nb]=Dolphin
 Name[nl]=Dolphin
@@ -42,6 +43,7 @@ GenericName[fr]=Gestionnaire de fichiers
 GenericName[gl]=Xestor de ficheiros
 GenericName[id]=Manajer Berkas
 GenericName[it]=Gestore dei file
+GenericName[ja]=ファイルマネージャ
 GenericName[ko]=파일 관리자
 GenericName[nb]=Filbehandler
 GenericName[nl]=Bestandsbeheerder
-- 
cgit v1.3