am 91f68386: (-s ours) am f5766c04: (-s ours) Import translations. DO NOT MERGE

* commit '91f683860a389b4bb02bcf86347228909229a6cb':