am 96510f12: (-s ours) am 4f365804: (-s ours) Import translations. DO NOT MERGE

* commit '96510f123eb98c9ec7d02747f18ec67827051913':