am d9411064: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 31 Oct 2014 17:13:13 +0000 (17:13 +0000)]
* commit 'd9411064719902245bf6251ce39a3fa841ee35c7':
  Import translations. DO NOT MERGE


Trivial merge