Correct some error and use the new translation system