am efbb7481: (-s ours) am b799cb87: (-s ours) Import translations. DO NOT MERGE

* commit 'efbb748153311924d79e40e6e1d0efcd9057f2a2':