am f51a4596: (-s ours) am f484bb16: (-s ours) am 624275b5: (-s ours) Import translations. DO NOT MERGE

* commit 'f51a45960848ed55f92ded99734acb33588d1918':