am 204e1dfa: (-s ours) am 1ae72b1b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 26 Aug 2013 22:10:00 +0000 (15:10 -0700)]
* commit '204e1dfabd35001917aa1d8761690cee15744297':
  Import translations. DO NOT MERGE


Trivial merge