Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2d17f93 -s ours
am: 937ad3c -s ours
* commit '937ad3c1a240afa4303f44fb137f35a336bf4974':
Import translations. DO NOT MERGE
This commit is contained in: