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

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