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

* commit '3e6fb5d66eed34c91b9b056ad2d4c317186476fd':
  Import revised translations.  DO NOT MERGE