am 0c7b409b: (-s ours) am bf707ac0: am a54290f1: am f255cedc: (-s ours) Import revised translations.  DO NOT MERGE

* commit '0c7b409bedf884712b3a5e5b1c12882e99567fd1':
  Import revised translations.  DO NOT MERGE