am 1ca2bc42: (-s ours) am 36861650: Import revised translations.  DO NOT MERGE

Merge commit '1ca2bc42e11eceb2bf98581640021a9b13d06854'

* commit '1ca2bc42e11eceb2bf98581640021a9b13d06854':
  Import revised translations.  DO NOT MERGE