From af34144f7fa85ba8ede2907e30c216630df0f3be Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 14 Aug 2018 05:54:05 +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/scale/scale_config.desktop | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/effects/scale/scale_config.desktop b/effects/scale/scale_config.desktop
index b018be93e1..783afb395c 100644
--- a/effects/scale/scale_config.desktop
+++ b/effects/scale/scale_config.desktop
@@ -6,3 +6,9 @@ X-KDE-Library=kwin_scale_config
 X-KDE-ParentComponents=scale
 
 Name=Scale
+Name[ca]=Escala
+Name[eu]=Eskalatu
+Name[nl]=Schalen
+Name[pt]=Escala
+Name[uk]=Масштабування
+Name[x-test]=xxScalexx