am 2186d96b: (-s ours) am 97c916a6: Import revised translations.  DO NOT MERGE

* commit '2186d96b62b705258dafbc454f02a02f5d9c6965':
  Import revised translations.  DO NOT MERGE