am 7aacced8: (-s ours) am 2377db31: am 8f461425: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '7aacced8dbdf91289ba13f47ee0a5050dcb75bb4'

* commit '7aacced8dbdf91289ba13f47ee0a5050dcb75bb4':
  Import revised translations.  DO NOT MERGE