Merge "Import translations. DO NOT MERGE" into nyc-dev am: 0f6b093db7 -s ours
am: 1319d058e5 -s ours
* commit '1319d058e5f95840136b71881c43251968eb2c99':
Import translations. DO NOT MERGE
This commit is contained in: