Sync language file with upstream
Merge branch 'upstream-staging' into restore-custom-fieldsets