am 31ba3576: (-s ours) am 996dcfde: am fd29c453: Import translations. DO NOT MERGE

* commit '31ba35766170cfea65ad3f8324f6dae2cceb7244':
  Import translations. DO NOT MERGE