am cbb24fc7: (-s ours) am 46416b8b: am 24cb1923: Import translations. DO NOT MERGE

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