am a2edad16: (-s ours) am 796e3c3f: (-s ours) Import translations. DO NOT MERGE

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