From f4e2593aa79cdc0483121507012b2045bf2e9703 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 3 Apr 2018 07:12:29 +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/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 447e21ac7..9895e2098 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]=Pengelola Fail
+GenericName[id]=Pengelola File
 GenericName[it]=Gestore dei file
 GenericName[ja]=ファイルマネージャ
 GenericName[ko]=파일 관리자
-- 
cgit v1.3