From: l10n daemon script <scripty@kde.org>
Date: Tue, 11 Jun 2019 03:13:47 +0000 (+0200)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/9f65f1de47510b92b2d153346f1c414c9fadac9f

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"
---

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]=축소됨