am 9b80409a: (-s ours) am b513f30a: (-s ours) Import translations. DO NOT MERGE

* commit '9b80409a54e3ff922866393643db8bb3aac9557f':