am b5ff5baf: (-s ours) am 22583be7: Import translations. DO NOT MERGE

* commit 'b5ff5baf8bf2858a787a5c71da4a92be762045ed':
  Import translations. DO NOT MERGE