1. Update translation files
2. Update template files for better format