am 25b80715: (-s ours) am 2d880d56: am 43e0fa3a: (-s ours) Import revised translations. DO NOT MERGE * commit '25b80715': Import revised translations. DO NOT MERGE