am 128b4e0b: (-s ours) am c318e2f9: (-s ours) Import translations. DO NOT MERGE

* commit '128b4e0b27bb9af21564c9085dc6a1335c7d77a4':
  Import translations. DO NOT MERGE