Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5a3dec0c40
-s ours
am: d9bd7b0324
-s ours
* commit 'd9bd7b032422c2bdb0ec8cb47b28f1b28f681550':
Import translations. DO NOT MERGE
This commit is contained in: