am f0ab16cf: (-s ours) am b24fcaae: (-s ours) Import translations. DO NOT MERGE

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