Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:46:18 +0000 (19:46 +0000)]
am: 4920a49117  -s ours

* commit '4920a49117cc2bf7df4093a00bbf108c675a25ed':
  Import translations. DO NOT MERGE


Trivial merge