am 18cc01e0: (-s ours) am 31122a5d: (-s ours) Import revised translations.  DO NOT MERGE

* commit '18cc01e06e8649cff026d738f063df7d0359ad4a':
  Import revised translations.  DO NOT MERGE