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


Trivial merge