am 5a0bf765: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 10 Sep 2013 14:39:25 +0000 (07:39 -0700)]
* commit '5a0bf765ff2ede5d964d7a1632d588d12c2ba0f7':
  Import translations. DO NOT MERGE


Trivial merge