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

* commit '3082e5fed04c42301c89de8df36e9d62f0937dec':
  Import revised translations.  DO NOT MERGE