am b6a5dab3: (-s ours) am feb6c7f3: (-s ours) Import translations. DO NOT MERGE
automerge: 06b284f  -s ours

* commit '06b284f22b51cb27ecad920ee1fa11806e45d935':
  Import translations. DO NOT MERGE