cleanly merge pull/509 into current develop branch

this pull request cleanly merges [509] (Multilanguage Support via gettext) with the current develop branch.