am 8cbaf59e: (-s ours) am 04e5a1cb: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit '8cbaf59e313227d41c9881fbedb4dc3255a83b8d'

* commit '8cbaf59e313227d41c9881fbedb4dc3255a83b8d':
  Import revised translations.  DO NOT MERGE