Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 16 Aug 2013 00:59:08 +0000 (00:59 +0000)]

Trivial merge