Hand-apply d3df94743970f2350a141dbc87faf59e0b762c26 from master; add comment for translators.