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/org.kde.dolphin.desktop | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/org.kde.dolphin.desktop')

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 63b72d966..f187cef58 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -62,6 +62,7 @@ GenericName[et]=Failihaldur
 GenericName[fi]=Tiedostonhallinta
 GenericName[fr]=Gestionnaire de fichiers
 GenericName[gl]=Xestor de ficheiros
+GenericName[he]=מנהל קבצים
 GenericName[hu]=Fájlkezelő
 GenericName[ia]=Gerente de file
 GenericName[id]=Manajer Berkas
-- 
cgit v1.3.1