Merge pull request #22 from cfoellmann/master

some gettext changes to use core translations as much as possible
string fix