am 847cec06: (-s ours) am 450be298: Import translations. DO NOT MERGE

* commit '847cec06a95eb5f5d6a1e1d440de8bebcfa11e6d':
  Import translations. DO NOT MERGE