Merge branch 'nd/i18n-misc'

Restructure the way message strings are created, in preparation for marking them for i18n. * nd/i18n-misc: rerere: remove i18n legos in result message notes-merge: remove i18n legos in merge result message reflog: remove i18n legos in pruning message