am 1f4bce9b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 16:40:38 +0000 (08:40 -0800)]
* commit '1f4bce9b9a4190f260d2eec1c144b8748a4b85c1':
  Import translations. DO NOT MERGE


Trivial merge