am c98a53aa: (-s ours) am bd5cc793: Reimport translations.  DO NOT MERGE

Merge commit 'c98a53aac66ddfde5edd789a512423b24249fa76'

* commit 'c98a53aac66ddfde5edd789a512423b24249fa76':
  Reimport translations.  DO NOT MERGE