Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Tue, 3 May 2016 16:30:03 +0000 (16:30 +0000)]

Trivial merge