am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGE

* commit 'f4d53d6fdad4335e817c6f71e730b0cf0165de0a':