am f4a4cc85: (-s ours) am 3b80e51f: (-s ours) am f7be630c: Import revised translations.  DO NOT MERGE

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