am 2b3b30bb: (-s ours) am a965f735: Import translations. DO NOT MERGE

* commit '2b3b30bbb5b38cad2411b1914a2df4e13280147f':
  Import translations. DO NOT MERGE