am c15701e8: (-s ours) am 0dbb0fdd: (-s ours) am 903b5694: (-s ours) am a8070554...
Baligh Uddin [Wed, 23 Sep 2015 19:52:02 +0000 (19:52 +0000)]
* commit 'c15701e81d55df8aa4e23c68741a20aa30e8e11b':
  Import translations. DO NOT MERGE


Trivial merge