am 9b6bb995: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sun, 6 Oct 2013 00:11:16 +0000 (17:11 -0700)]
* commit '9b6bb99520cd6252443b5c800f7f9f73ed272f54':
  Import translations. DO NOT MERGE


Trivial merge