am f2545189: am 22d63c44: (-s ours) am 8b62d386: (-s ours) Import translations. DO NOT MERGE

* commit 'f254518958cde4cc84a7ee9a1f6923959cbf8b55':