am 311f7fa0: (-s ours) am e92baf94: (-s ours) am ada94283: Import revised translations.  DO NOT MERGE

* commit '311f7fa07b4be8e7fbe128c59e474baf8fd71f94':
  Import revised translations.  DO NOT MERGE