am d7b7c2ce: (-s ours) am 23edefc6: Import translations. DO NOT MERGE

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