Merge "Fix inconsistent i18n escaping in category paging links."