am d37c1e64: (-s ours) am bc2fb6b8: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit 'd37c1e6439132d55c97713237ce756a545383b5e'

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