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"

kcms/style/kcm_style.desktop

@@ -95,6 +95,7 @@ X-KDE-Keywords[pa]=ਸਟਾਈਲ,ਸ਼ੈਲੀ,ਦਿੱਖ,ਵਿਜੈੱਟ,
 X-KDE-Keywords[pt]=estilo,estilos,aparência,elemento,ícones,barras de ferramentas,texto,realce,aplicações,aplicações do KDE,tema,plasma,menu,menu global,GTK,GNOME
 X-KDE-Keywords[pt_BR]=estilo,estilos,aparência,widget,ícones,barras de ferramentas,texto,realce,aplicativos,aplicativos do KDE,tema,plasma, menu, menu global,GTK,GNOME
 X-KDE-Keywords[ro]=stil,stiluri,aspect,control,pictograme,bare,text,evidențiere,aplicații,aplicații KDE,temă,tematică,plasma,meniu,meniu global,GTK,GNOME
+X-KDE-Keywords[ru]=style,styles,look,widget,icons,toolbars,text,highlight,apps,KDE applications,theme,plasma,menu,global menu,GTK,GNOME,стиль,стили,внешний вид,виджет,значки,панель инструментов,текст,подсветка,приложения,приложения KDE,тема,плазма,меню,глобальное меню
 X-KDE-Keywords[sk]=štýl,štýly,vzhľad,widget,ikony,panely nástrojov,text,zvýraznenie,aplikácie,KDE aplikácie,téma,plasma,ponuka,globálna ponuka,GTK,GNOME
 X-KDE-Keywords[sl]=slog,slogi,videz,gradnik,ikone,orodne vrstice,besedilo,osvetljevanje,aplikacije,aplikacije KDE,tema,plasma,meni,globalni meni,GTK,GNOME
 X-KDE-Keywords[sv]=stil,stilar,utseende,grafisk komponent,ikoner,verktygsrader,text,markering,program,KDE-program,tema,plasma,meny,global meny,GTK,GNOME

login-sessions/plasmax11.desktop.cmake

@@ -17,6 +17,7 @@ Name[nl]=Plasma (X11)
 Name[nn]=Plasma (X11)
 Name[pa]=ਪਲਾਜ਼ਮਾ (X11)
 Name[pt]=Plasma (X11)
+Name[ru]=Plasma (X11)
 Name[sk]=Plasma (X11)
 Name[sl]=Plasma (X11)
 Name[sv]=Plasma (X11)