From 9f65f1de47510b92b2d153346f1c414c9fadac9f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 11 Jun 2019 05:13:47 +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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 5f2d09345..19c072a02 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -129,7 +129,7 @@ Name[gl]=Compacta
 Name[he]=קומפקטי
 Name[hu]=Kompakt
 Name[ia]=Compacte
-Name[id]=Sederhana
+Name[id]=Ringkas
 Name[it]=Compatta
 Name[ja]=コンパクト
 Name[ko]=축소됨
-- 
cgit v1.3