am fea2b30a: (-s ours) am 37dfaa13: (-s ours) Import translations. DO NOT MERGE

* commit 'fea2b30ac49e5075a4cc78c1e694a62334192f0a':
  Import translations. DO NOT MERGE