am 7b6c66d5: (-s ours) am 077cf819: Import translations. DO NOT MERGE

* commit '7b6c66d5ad5550579f165c053b366195fa96979c':