am 12f7f484: (-s ours) am 85eee52a: am 257de1d9: (-s ours) Import translations. DO NOT MERGE

* commit '12f7f48460f5ee9f574379fcc09642e9895b912a':