am 21fd4ab9: (-s ours) am 04220c34: Import translations. DO NOT MERGE

* commit '21fd4ab93f1959ad5e2eb1d609d3ccc491615d15':
  Import translations. DO NOT MERGE