Fix markup in templates.
Fix translation conflicts.
Update German translations.
Add French translations.
Add english translations.