am 8b3d8c64: (-s ours) am 55191f60: (-s ours) Import translations. DO NOT MERGE

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