am f1266ce2: (-s ours) am 2f928303: Import revised translations.  DO NOT MERGE

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