am 9824f21d: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 1 Nov 2013 14:16:34 +0000 (07:16 -0700)]
* commit '9824f21d1fc306d6c4df7b846ee6b64e0692267b':
  Import translations. DO NOT MERGE


Trivial merge