am 6670a579: (-s ours) am a8484d84: (-s ours) Import translations. DO NOT MERGE

* commit '6670a5793193164f3f39388784779963c034ca08':
  Import translations. DO NOT MERGE