From 7effd6bf19b850b1dd954846a1b843e1575bab24 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 2 Jan 2018 04:47:58 +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 | 51 +++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/effects/slide/slide_config.desktop b/effects/slide/slide_config.desktop
index c2866e36b6..84ce11b2eb 100644
--- a/effects/slide/slide_config.desktop
+++ b/effects/slide/slide_config.desktop
@@ -6,4 +6,53 @@ X-KDE-Library=kwin_slide_config
 X-KDE-ParentComponents=slide
 
 Name=Slide
-Name[x-test]=xxSlidexx
+Name[ar]=أزْلِق
+Name[bg]=Приплъзване
+Name[csb]=Pùrganié
+Name[da]=Glid
+Name[de]=Gleiten
+Name[el]=Κύλιση
+Name[en_GB]=Slide
+Name[eo]=Lumbildo
+Name[es]=Deslizar
+Name[et]=Liuglemine
+Name[eu]=Irristatu
+Name[fi]=Liu’utus
+Name[fr]=Glisser
+Name[fy]=Glydzje
+Name[ga]=Sleamhnaigh
+Name[gl]=Deslizar
+Name[gu]=સ્લાઇડ
+Name[hi]=स्लाइड
+Name[hne]=स्लाइड
+Name[hr]=Pomak
+Name[hu]=Csúsztatott váltás
+Name[ia]=Glissa
+Name[id]=Geser
+Name[is]=Renna til
+Name[it]=Scivola
+Name[kk]=Сырғанату
+Name[km]=ស្លាយ
+Name[kn]=ಜಾರು
+Name[ku]=Xîş Bike
+Name[lv]=Slīdēt
+Name[mai]=स्लाइड
+Name[ml]=തെന്നിമാറുക
+Name[mr]=सरकणे
+Name[nds]=Glieden
+Name[nl]=Schuiven
+Name[pa]=ਸਲਾਈਡ
+Name[pl]=Slajd
+Name[ro]=Alunecă
+Name[ru]=Прокрутка
+Name[si]=ලිස්සන්න
+Name[sk]=Posúvať
+Name[sl]=Drsenje
+Name[sv]=Skjut
+Name[ta]=நழுவு
+Name[tg]=Слайд
+Name[th]=เลื่อนหน้าต่าง
+Name[tr]=Kaydır
+Name[ug]=تام تەسۋىر
+Name[wa]=Rider
+Name[zh_TW]=滑動