am 7cb72808: am 785c5068: (-s ours) am 5eb28c19: am a130057b: Import translations. DO NOT MERGE

* commit '7cb72808551d5543ffce16d7287c029ec689af16':