From dc707c5c4eb3ece8417dc540de5547f48dd98fef Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 7 Oct 2018 08:03:19 +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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/effects/scale/scale_config.desktop b/effects/scale/scale_config.desktop
index 25e84b3d90..712e60ed01 100644
--- a/effects/scale/scale_config.desktop
+++ b/effects/scale/scale_config.desktop
@@ -22,6 +22,7 @@ Name[nn]=Skalering
 Name[pl]=Skala
 Name[pt]=Escala
 Name[pt_BR]=Escala
+Name[ru]=Масштабирование
 Name[sk]=Škálovať
 Name[sv]=Skala
 Name[uk]=Масштабування