am 7f13f61b: (-s ours) am c478796c: (-s ours) am 8f3c6521: (-s ours) Import translati...
Baligh Uddin [Tue, 7 Jan 2014 17:53:09 +0000 (17:53 +0000)]
* commit '7f13f61be97d5774516be544239bc0a0338cfb47':
  Import translations. DO NOT MERGE


Trivial merge