am 612f55df: (-s ours) am 109c6f5f: (-s ours) Import translations. DO NOT MERGE

* commit '612f55dfb8e5d9744be26f5ad0a795168063a172':