Merged! [MERGE] Language Updates

[Bundle Buggy]

This change has been merged.
Previous status: Approved
For details, see: 
http://bundlebuggy.aaronbentley.com/project/squid/request/%3C20080808061444.ED7E3206218%40treenet.co.nz%3E
Project: Squid