am 0d542b48: (-s ours) am 5d8633d2: Import revised translations. DO NOT MERGE
* commit '0d542b48f5299990df9fb81c538bd22bdc64881b': Import revised translations. DO NOT MERGEmain
commit
969c014b07
* commit '0d542b48f5299990df9fb81c538bd22bdc64881b': Import revised translations. DO NOT MERGEmain