i18n merge and fixes after hot-keys added.