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