am 33f5d575: (-s ours) am fd74e7a7: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 7 Jul 2014 17:41:23 +0000 (17:41 +0000)]
* commit '33f5d5750b50208fddb86cc7d96616ca7978fd5d':
  Import translations. DO NOT MERGE


Trivial merge