am a87655b6: (-s ours) am 6694d2f9: (-s ours) am 7ef0077f: Import revised translations.  DO NOT MERGE

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