am d1fbac1a: (-s ours) am 06d3867b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 22:00:04 +0000 (22:00 +0000)]
* commit 'd1fbac1ae8782641ef78faef46f10bdb4e126b18':
  Import translations. DO NOT MERGE


Trivial merge