am 0d5b239b: (-s ours) am e648fd61: Import translations. DO NOT MERGE

* commit '0d5b239b83218b2c8c812d60b4e31b18a4cc9ea0':
  Import translations. DO NOT MERGE