am bf01b629: am 5d0aeda9: (-s ours) am f2cacdae: am c85dde47: Import translations. DO NOT MERGE

* commit 'bf01b62901cc6009d1284d3940a7a8b9e9a6e0d8':