am 31fca99b: (-s ours) am 81c93829: (-s ours) Import translations. DO NOT MERGE

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