am f684cf4d: (-s ours) am c70e3b72: Import revised translations.  DO NOT MERGE

* commit 'f684cf4d99803c8d88d81c95e0e8b804d63a4587':
  Import revised translations.  DO NOT MERGE