From 7764de0470113e9cc7f9de242cbe48f70def6354 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 6 Jan 2018 04:52:25 +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/slide/slide_config.desktop | 1 +
 1 file changed, 1 insertion(+)

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