Merge branch 'js/i18n-windows'