am 4640ee86: (-s ours) am 562221c7: (-s ours) am 57b4a306: (-s ours) am 1dbf8e6d...
Baligh Uddin [Sat, 16 Aug 2014 23:31:51 +0000 (23:31 +0000)]
* commit '4640ee868357d9c8d184a6448cd92cb5dcd24962':
  Import translations. DO NOT MERGE


Trivial merge