am 42c89522: (-s ours) am fa62894c: Import revised translations. DO NOT MERGE
* commit '42c895225352da324198af0a5b192b59d9207201': Import revised translations. DO NOT MERGEmain
commit
61393bf01c
* commit '42c895225352da324198af0a5b192b59d9207201': Import revised translations. DO NOT MERGEmain