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

Merge commit 'c4ddd01c56adb609bbe835a40968f55307d7e83a'

* commit 'c4ddd01c56adb609bbe835a40968f55307d7e83a':
  Import revised translations DO NOT MERGE