am 4142f70c: (-s ours) am 56a6fad3: am 7abcd22d: Import translations. DO NOT MERGE

* commit '4142f70c5836f0b2830a3d22a02cc6781084bd5b':
  Import translations. DO NOT MERGE