Merge "Fix the translation doesn't work" into udc-dev