From 4be9264b8a40e44c8232e0fb4f989dc2d11396f4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 19 May 2018 08:34:54 +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/slide/slide_config.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/effects/slide/slide_config.desktop b/effects/slide/slide_config.desktop
index f4cdb582ae..9e47ac3454 100644
--- a/effects/slide/slide_config.desktop
+++ b/effects/slide/slide_config.desktop
@@ -67,5 +67,5 @@ Name[ug]=تام تەسۋىر
 Name[uk]=Ковзання
 Name[wa]=Rider
 Name[x-test]=xxSlidexx
-Name[zh_CN]=滑行
+Name[zh_CN]=滑动
 Name[zh_TW]=滑動