Update translation strings and a few minor fixes
Merge pull request #333 from CloudNiner/topic/translation-update

Update translation strings and a few minor fixes