am 146ea842: (-s ours) am b775f325: (-s ours) Import translations. DO NOT MERGE

* commit '146ea8427a124bc27cd77057f4a1cccfda184b87':