am f6d197a7: (-s ours) am 613cab12: am f9d69170: Import translations. DO NOT MERGE

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