Normalize formatting.  Add more comments for translators.  Remove v1.0-warnings (since that is being removed in v2.2).