am 4f48b435: (-s ours) am e042f952: (-s ours) Import translations. DO NOT MERGE

* commit '4f48b435cefa07d722225d74eccfafc0c0091ba8':
  Import translations. DO NOT MERGE