Hand apply 24f71545c866510644503e0ed88eb862ff8f25cb from master;
fix markup of TRANSLATORS comments.