Adjust [29806] and revert [29807] to restore placeholder and email copy order.

Avoids unnecessarily changing a (large, carefully formatted) translated string from 4.0.

fixes #21089.


git-svn-id: https://develop.svn.wordpress.org/trunk@30742 602fd350-edb4-49c9-b593-d223f7449a82