am 0f928ce6: (-s ours) am 1834eb63: (-s ours) Import translations. DO NOT MERGE

* commit '0f928ce625d7bc41dbd3441208e3c3d5dbeb89d4':
  Import translations. DO NOT MERGE