am c4d1b2cc: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Aug 2013 00:31:34 +0000 (17:31 -0700)]
* commit 'c4d1b2cc3c7fd3b043961f0110ef1bf6f0a4a505':
  Import translations. DO NOT MERGE


Trivial merge