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