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


Trivial merge