am cc5b08b6: (-s ours) am 8d7fdc61: (-s ours) Import translations. DO NOT MERGE

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