am 369bf1d1: (-s ours) am f4e7f3fe: (-s ours) am 5054aebd: (-s ours) Import translati...
Baligh Uddin [Tue, 16 Sep 2014 17:17:51 +0000 (17:17 +0000)]
* commit '369bf1d17db3bdffbf7ecb4e1bad7949f0c9f2d6':
  Import translations. DO NOT MERGE


Trivial merge