am 2d873667: (-s ours) Import translations. DO NOT MERGE

* commit '2d873667bde0a699fb4a667cf3d296b155ac6044':
  Import translations. DO NOT MERGE