am 156b98b6: (-s ours) am c522f9f3: Import translations. DO NOT MERGE * commit '156b98b63439db17cbfed90577eae870e69cf95f': Import translations. DO NOT MERGE