Merge pull request #960 from komachi/master

Update Russian translation and fix some errors
line # fixes
layout and translation fixes for #960
Localize everything.