From e46421bfeee7a2d4f8f61c24feee2758325e86a4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 3 Mar 2018 05:23:49 +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/org.kde.dolphin.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index f187cef58..447e21ac7 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -65,7 +65,7 @@ GenericName[gl]=Xestor de ficheiros
 GenericName[he]=מנהל קבצים
 GenericName[hu]=Fájlkezelő
 GenericName[ia]=Gerente de file
-GenericName[id]=Manajer Berkas
+GenericName[id]=Pengelola Fail
 GenericName[it]=Gestore dei file
 GenericName[ja]=ファイルマネージャ
 GenericName[ko]=파일 관리자
-- 
cgit v1.3