From 4d9c396a9877ff459703c6372b5426860a32400b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 25 May 2017 04:21:54 +0200
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 da0a659d3..a0d7a96b2 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -71,6 +71,7 @@ Name[et]=Ikoonid
 Name[fi]=Kuvakkeet
 Name[fr]=Icônes
 Name[gl]=Iconas
+Name[he]=סמלים
 Name[hu]=Ikonok
 Name[ia]=Icones
 Name[id]=Ikon
@@ -118,6 +119,7 @@ Name[et]=Kompaktne
 Name[fi]=Tiivis
 Name[fr]=Concis
 Name[gl]=Compacta
+Name[he]=קומפקטי
 Name[hu]=Kompakt
 Name[ia]=Compacte
 Name[id]=Sederhana
@@ -165,6 +167,7 @@ Name[et]=Üksikasjad
 Name[fi]=Yksityiskohdat
 Name[fr]=Détails
 Name[gl]=Detalles
+Name[he]=פרטים
 Name[hu]=Részletek
 Name[ia]=Detalios
 Name[id]=Detail
-- 
cgit v1.3