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"

plugins/krunner-integration/kwin-runner-windows.desktop

@@ -41,6 +41,7 @@ Comment[nn]=Vis vindauge og skrivebord, og byt mellom dei
 Comment[pl]=Wypisuje okna i pulpity oraz przełącza pomiędzy nimi
 Comment[pt]=Listar as janelas e ecrãs e mudar entre elas
 Comment[pt_BR]=Lista as janelas e áreas de trabalho e alterna entre elas
+Comment[ru]=Просмотр списка и переключение между окнами и рабочими столами
 Comment[sk]=Zobraziť okná a plochy a prepnúť ich
 Comment[sl]=Prikaži seznam oken in namizij in preklopi med njimi
 Comment[sv]=Lista fönster och skrivbord, och byt mellan dem