am d247d860: (-s ours) am 4aa14f03: (-s ours) am b5071e4a: (-s ours) am 4802efe1...
Baligh Uddin [Thu, 16 Oct 2014 19:52:24 +0000 (19:52 +0000)]
* commit 'd247d86085cf4385e6de2822f55da88376ca165d':
  Import translations. DO NOT MERGE


Trivial merge