[translation] [minor]
[lang] [minor]
[merge] [conflicts]