From 1f645b4bc5ddf88018f83106fc2d0926b4755424 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 20 Nov 2018 08:43:32 +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/wobblywindows/wobblywindows_config.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/effects/wobblywindows/wobblywindows_config.desktop b/effects/wobblywindows/wobblywindows_config.desktop
index 350c3f8fab..a1baf69593 100644
--- a/effects/wobblywindows/wobblywindows_config.desktop
+++ b/effects/wobblywindows/wobblywindows_config.desktop
@@ -58,7 +58,7 @@ Name[pl]=Chwiejne okna
 Name[pt]=Janelas Trémulas
 Name[pt_BR]=Janelas instáveis
 Name[ro]=Ferestre tremurătoare
-Name[ru]=Дрожащие окна
+Name[ru]=Колышущиеся окна
 Name[si]=කවුළු සොලවන්න
 Name[sk]=Zvlnené okná
 Name[sl]=Majava okna