am 870ab30a: (-s ours) am c7f102af: (-s ours) am f4b1e9c8: (-s ours) am 09128d0a...
Baligh Uddin [Wed, 17 Sep 2014 05:09:53 +0000 (05:09 +0000)]
* commit '870ab30a0546f37791f0ac0299074406c387b890':
  Import translations. DO NOT MERGE


Trivial merge