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

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