Fix #Bug102-105 Translation enhancements