am cfb05dc6: (-s ours) am 9ac82606: (-s ours) am c0604255: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

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