am f42b09ef: (-s ours) am 8f406315: (-s ours) Import revised translations.  DO NOT MERGE

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