From 51bf12e62940130247e3343e49b10f005be15190 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 12 Nov 2018 08:21:59 +0100
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/zoom/zoom_config.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/effects/zoom/zoom_config.desktop b/effects/zoom/zoom_config.desktop
index 87f5fc42d5..03d37b113c 100644
--- a/effects/zoom/zoom_config.desktop
+++ b/effects/zoom/zoom_config.desktop
@@ -40,7 +40,7 @@ Name[hne]=जूम
 Name[hr]=Povećanje
 Name[hu]=Kinagyítás
 Name[ia]=Zoom
-Name[id]=Zoom
+Name[id]=Zum 
 Name[is]=Aðdráttur
 Name[it]=Ingrandimento
 Name[ja]=ズーム