am a4886874: (-s ours) am 7df08466: Import translations. DO NOT MERGE

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