am 42dc0c25: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '42dc0c256220496743a2532b7d51823d1d4d65d9':
  Import translations. DO NOT MERGE