am 3164190b: am 20a3b8c7: (-s ours) Import translations. DO NOT MERGE

* commit '3164190be01d1ae8fdfcaa836c3d14f6d19fd1f9':