am d3ad7d4d: (-s ours) am e424b26d: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 25 Aug 2014 16:45:16 +0000 (16:45 +0000)]
* commit 'd3ad7d4dd7157129c2cf485a5f1d3c396ddb98c0':
  Import translations. DO NOT MERGE


Trivial merge