am cb5262cf: (-s ours) am 2da9c656: (-s ours) Import translations. DO NOT MERGE

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