am b8c7336b: (-s ours) am fc6cdb9e: (-s ours) am 23c73693: (-s ours) Import translations. DO NOT MERGE

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