Fixed a bug with the menu

The menu wasn't getting added to the DOM if you were using the normal
toolbar and have not changed your settings since 2.1.5.

This bug was caused by fb3cda1cf84d4a2d026cb185ce8b2cc8a5a07c4f

Since no releases are planned for the near future this requires one of
its own.
Modified the toolbar check to migrate the setting
Updated locale files
Incremented the version
Merge remote-tracking branch 'origin/master' into new-tab