am 92d30541: (-s ours) am 6abdbbcb: (-s ours) Import translations. DO NOT MERGE

* commit '92d30541a884e4a0a9766ed3882480349f4554d8':
  Import translations. DO NOT MERGE