Follow up on #2129

This is a follow up on #2129 for the pt translation : 
Reorganize templates list and add missing variables