Import translations. DO NOT MERGE am: c38d495  -s ours
am: d686dc7  -s ours

* commit 'd686dc74168ed5324b2388133531f30255659ae6':
  Import translations. DO NOT MERGE