am 391e4c0a: (-s ours) am bb3a3312: (-s ours) Import translations. DO NOT MERGE

* commit '391e4c0adc0c65c550cbe6b4e4abd978b4dfef95':