From 91eb6aa37ae38c73441b6100a4ea9beb35e982f4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 20 Dec 2017 08:25:12 +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 a0d7a96b2..9bf9f95cf 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -170,7 +170,7 @@ Name[gl]=Detalles
 Name[he]=פרטים
 Name[hu]=Részletek
 Name[ia]=Detalios
-Name[id]=Detail
+Name[id]=Perincian
 Name[it]=Dettagli
 Name[ja]=詳細
 Name[ko]=자세히
-- 
cgit v1.3