am 0cee34f9: (-s ours) am 4a20d330: (-s ours) Import translations. DO NOT MERGE

* commit '0cee34f962d020226992018f3319d5553f6699e2':
  Import translations. DO NOT MERGE