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


Trivial merge