fix #4369: translation warning at wrong time
Merge branch 'issue-4369' into upstream