Reordering.
__notas__ update.
Minimal changes for future features.
Update translation templates.