am f36574be: am baa22861: (-s ours) Import translations. DO NOT MERGE

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