translation continued
Merge pull request #756 from shawnthompson/translation

translation continued