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


Trivial merge