am 8f21bd29: (-s ours) am 35a5f7af: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 7 Jul 2014 17:40:26 +0000 (17:40 +0000)]
* commit '8f21bd292ee81f532469d931f3590af2d633a0b3':
  Import translations. DO NOT MERGE


Trivial merge