am 86f61173: (-s ours) Import translations. DO NOT MERGE

* commit '86f61173e8bedc9ccd3578e5ce0e79de0c1a9a1d':
  Import translations. DO NOT MERGE