am 5198624c: (-s ours) am ae87c907: (-s ours) Import translations. DO NOT MERGE
automerge: 4c54180  -s ours

* commit '4c54180dc708780d8eb99e97b0f9f78b11de7242':