am 96edf807: (-s ours) Import translations. DO NOT MERGE

* commit '96edf8077347297d030af02a9452c726bbc421c8':
  Import translations. DO NOT MERGE