am 12d64129: (-s ours) am c53e033e: (-s ours) Import translations. DO NOT MERGE

* commit '12d6412978761f1aab14fbe9244d14c7cefc63b8':
  Import translations. DO NOT MERGE