am e4dc524e: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Oct 2013 04:48:06 +0000 (21:48 -0700)]
* commit 'e4dc524e195b2dd8d86dd80504500f8f5bb11d92':
  Import translations. DO NOT MERGE


Trivial merge