am cf358f6b: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'cf358f6b809937a7888612a7b42cb6b3074cecc1':
  Import revised translations.  DO NOT MERGE