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

@@ -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