Add placeholders to messages.json. Keep localized text in HTML file for round-tripping.
Resolve trivial merge conflict in comments.