From af1e13f9fa86c6a7f9bf397269559eda38e7aec6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 3 Nov 2020 06:20:03 +0100
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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/dolphinpart.desktop')

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 33d8dd97e..0e7efd8e3 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -135,7 +135,7 @@ Name[eu]=Trinkoa
 Name[fi]=Tiivis
 Name[fr]=Concis
 Name[gl]=Compacta
-Name[he]=קומפקטי
+Name[he]=חסכונית
 Name[hu]=Kompakt
 Name[ia]=Compacte
 Name[id]=Ringkas
-- 
cgit v1.3