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

Merge commit 'b806823d7d004e966db8a24a9ac42e5ee2d5806d'

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