am beb955d7: (-s ours) am fb942dcd: (-s ours) Import translations. DO NOT MERGE

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