am 3bf487e2: (-s ours) am f17161d9: Import translations. DO NOT MERGE

* commit '3bf487e2273034f0c82f2685bd0208075565178d':
  Import translations. DO NOT MERGE