am 5eff2b04: (-s ours) am f718b924: (-s ours) Import translations. DO NOT MERGE

* commit '5eff2b04d8a0a98b77029d543f1c23070b2a0e69':
  Import translations. DO NOT MERGE