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

Merge commit '12028eb0597dc066392af63f6964db456442e466' into gingerbread-plus-aosp

* commit '12028eb0597dc066392af63f6964db456442e466':
  Import revised translations.  DO NOT MERGE