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


Trivial merge