am 8bdff0c6: (-s ours) am ef3b4c4f: (-s ours) am 1ccd7637: (-s ours) Import translations. DO NOT MERGE

* commit '8bdff0c6e758f830c9f76bdad9ddb5140138b087':