Updated russian translation + fixed the conflicts with prior pull requests

Updated russian translation + fixed the conflicts with prior pull requests