From e61383a1986ca1479120001c3f21f29af0208f8c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 31 Mar 2018 05:20:59 +0200
Subject: [PATCH] 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"
---
 effects/blur/blur_config.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/effects/blur/blur_config.desktop b/effects/blur/blur_config.desktop
index 133f399e76..ba93d5cd6b 100644
--- a/effects/blur/blur_config.desktop
+++ b/effects/blur/blur_config.desktop
@@ -39,7 +39,7 @@ Name[hr]=Mrlja
 Name[hsb]=Młowojty
 Name[hu]=Elmosódás
 Name[ia]=Obscura (Blur)
-Name[id]=Samar
+Name[id]=Buram
 Name[is]=Móða
 Name[it]=Sfocatura
 Name[ja]=ぼかし