Including maintainer review commits:

Fix variables names in HAML templates
Regenerate the locales file
Add context to locales phrases
Bring back the form area
Fix disable_merge_trains_setting spec
Remove incorrect prefix from some i18n strings