Merge pull request #1090 from musashino205/i18n-sync