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

* commit '53895480f481b0ed54b3f0600e7c971b4e0adf4c':