Merge branch 'jc/i18n-shell-script-gettext'