am 645f5e98: (-s ours) am f11c0a24: (-s ours) am e37ee542: Import revised translations. DO NOT MERGE * commit '645f5e98': Import revised translations. DO NOT MERGE