am 994b896e: (-s ours) am 4000887f: (-s ours) am 0308361b: Import translations. DO NOT MERGE

* commit '994b896ef15187b8e7abef679e76540d57f4b144':