am 84d6b6d2: (-s ours) Import translations. DO NOT MERGE

* commit '84d6b6d289cb663c3efbfb4c1f305a3dae41f1d0':
  Import translations. DO NOT MERGE