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

Merge commit '04e5a1cba9671d2d6b07dbb9bc3b8d18fa610321' into gingerbread-plus-aosp

* commit '04e5a1cba9671d2d6b07dbb9bc3b8d18fa610321':
  Import revised translations.  DO NOT MERGE