am 05cb82ca: (-s ours) am 96acc0e5: Import translations. DO NOT MERGE

* commit '05cb82caeed3d1b710c74cbba5ac97ee61c1d8ae':
  Import translations. DO NOT MERGE