Merge pull request #1073 from bcipolli/update_language

Final cleanup / refactoring of i18n code, refactor updates to have a base.html
Merge pull request #1074 from bcipolli/updates_template_updates

Updates template updates
fixing string wrapping errors, linting to make text searches for such errors easier.
Merge pull request #1089 from bcipolli/wrap_error_fixup

fixing string wrapping errors, linting to make text searches for such errors easier.
Fixes for internationalization--one trans error, one test failure.
Merge remote-tracking branch 'refs/remotes/upstream/release-0.11' into 853