am 848a8fc2: (-s ours) Import translations. DO NOT MERGE

* commit '848a8fc210c4c9268d8ea3b7f552a53716c5a1d6':
  Import translations. DO NOT MERGE