am bb611587: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Jun 2014 16:49:48 +0000 (16:49 +0000)]
* commit 'bb6115874c6377c358019acf85d5f78a498e762b':
  Import translations. DO NOT MERGE


Trivial merge