am 6a3358cc: (-s ours) am eb014bf7: am c1fc2fe2: (-s ours) Import revised translations. DO NOT MERGE * commit '6a3358cc': Import revised translations. DO NOT MERGE