am 29ab591d: (-s ours) am f75c08de: (-s ours) Import translations. DO NOT MERGE

* commit '29ab591d1f807e166b8e6cfc188f121c2539f024':
  Import translations. DO NOT MERGE