am 7299bda6: (-s ours) am 7a21dec1: (-s ours) Import translations. DO NOT MERGE

* commit '7299bda6eb46bb468d97befff622bb1c4d4a0e69':