am a8478986: (-s ours) am b55b15c3: Import translations. DO NOT MERGE

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