am 7f1a1373: (-s ours) am 097a8676: (-s ours) am ddacd6ac: (-s ours) Import translations. DO NOT MERGE

* commit '7f1a13732e836fa431f889c58e4f3252f99a06bd':