Update the shortcut text in settings to reflect current shortcut.

Cherry-pick from https://github.com/jamespayor/tabToWindow
4c957f547581060322ab06f3daa9fdb52386c4aa

Conflicts:
	js/options.js