From 82cfc125f4fd37083e3adf3c5d2b999124262807 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 10 Oct 2016 09:41:54 +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 | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/dolphinpart.desktop')

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index a4bac816f..6b9398da8 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -124,6 +124,7 @@ Name[hu]=Kompakt
 Name[ia]=Compacte
 Name[id]=Sederhana
 Name[it]=Compatta
+Name[ja]=コンパクト
 Name[ko]=축소됨
 Name[lt]=Kompaktiškas
 Name[nb]=Kompakt
-- 
cgit v1.3.1