Merge commit 'bbad6e4a9b30e780f36980e5beac94738ebcd52c' * commit 'bbad6e4a9b30e780f36980e5beac94738ebcd52c': Armor string format tokens with translation placeholders.
Merge commit 'bbad6e4a9b30e780f36980e5beac94738ebcd52c' * commit 'bbad6e4a9b30e780f36980e5beac94738ebcd52c': Armor string format tokens with translation placeholders.