am a4c68be8: (-s ours) am e87f45eb: (-s ours) Import translations. DO NOT MERGE

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