am 8b17830e: (-s ours) am 1bc35eab: (-s ours) Import translations. DO NOT MERGE

* commit '8b17830ee6588a6bc3d9d20fdc407c98a1aba2d3':
  Import translations. DO NOT MERGE