merged branch schmittjoh/translationFixes (PR #2213)
merged branch schmittjoh/translationFixes (PR #2213)

Commits
-------

c0e6118 yet another fix
cb9383d some more fixes
7a20b89 fixes some typos
ac765fc avoid circular references
9b025b7 fixed typo

Discussion
----------

Translation fixes

gregquat/translation,symfony/Translation,oswaldderiemaecker/Translation