am c0604255: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

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