am 890cfb8a: (-s ours) am eb140c18: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Sep 2014 21:00:24 +0000 (21:00 +0000)]
* commit '890cfb8aa369ab5feb4f598d569a71e69ea28e50':
  Import translations. DO NOT MERGE


Trivial merge