am c056b456: (-s ours) am 890cfb8a: (-s ours) am eb140c18: (-s ours) Import translati...
Baligh Uddin [Mon, 29 Sep 2014 21:11:32 +0000 (21:11 +0000)]
* commit 'c056b4560e2cea69c985186174ba463fcb093642':
  Import translations. DO NOT MERGE


Trivial merge