am 12839cab: (-s ours) am d4e43d78: Import revised translations.  DO NOT MERGE

Merge commit '12839cab8417a676f7ff145e64ee07c4dc9b9dae'

* commit '12839cab8417a676f7ff145e64ee07c4dc9b9dae':
  Import revised translations.  DO NOT MERGE